harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always use system provided baseurl if configured

Browse Source
This commit is contained in:
friendica 2013-08-25 20:02:24 -07:00
parent c2fe299d16
commit df3cf811f0
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
boot.php
View File

@ -289,6 +289,14 @@ define ( 'MENU_ITEM_ZID', 0x0001);
define ( 'MENU_ITEM_NEWWIN', 0x0002); define ( 'MENU_ITEM_NEWWIN', 0x0002);
/**
* Poll/Survey types
*/
define ( 'POLL_SIMPLE_RATING', 0x0001);
define ( 'POLL_MULTIPLE_CHOICE', 0x0002);
/** /**
* Maximum number of "people who like (or don't like) this" that we will list by name * Maximum number of "people who like (or don't like) this" that we will list by name
*/ */
@ -744,6 +752,18 @@ class App {
} }
function get_baseurl($ssl = false) { function get_baseurl($ssl = false) {
if(is_array($this->config)
&& array_key_exists('system',$this->config)
&& is_array($this->config['system'])
&& array_key_exists('baseurl',$this->config['system'])
&& strlen($this->config['system']['baseurl'])) {
$url = $this->config['system']['baseurl'];
return $url;
}
$scheme = $this->scheme; $scheme = $this->scheme;
if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) { if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
@ -1277,6 +1297,8 @@ function fix_system_urls($oldurl,$newurl) {
require_once('include/crypto.php'); require_once('include/crypto.php');
logger('fix_system_urls: renaming ' . $oldurl . ' to ' . $newurl);
// Basically a site rename, but this can happen if you change from http to https for instance - even if the site name didn't change // Basically a site rename, but this can happen if you change from http to https for instance - even if the site name didn't change
// This should fix URL changes on our site, but other sites will end up with orphan hublocs which they will try to contact and will // This should fix URL changes on our site, but other sites will end up with orphan hublocs which they will try to contact and will
// cause wasted communications. // cause wasted communications.

2
version.inc
View File

@ -1 +1 @@
2013-08-24.415 2013-08-25.416