aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-08-25 20:02:24 -0700
committerfriendica <info@friendica.com>2013-08-25 20:02:24 -0700
commitdf3cf811f044fe49173ea4b1b9d19bcdff76bc26 (patch)
tree330269d1d39e39f2bbb4419b6d93bedcb8ba96f8
parentc2fe299d16f6766f66a8213f44e51e97b10d9aad (diff)
downloadvolse-hubzilla-df3cf811f044fe49173ea4b1b9d19bcdff76bc26.tar.gz
volse-hubzilla-df3cf811f044fe49173ea4b1b9d19bcdff76bc26.tar.bz2
volse-hubzilla-df3cf811f044fe49173ea4b1b9d19bcdff76bc26.zip
always use system provided baseurl if configured
-rwxr-xr-xboot.php22
-rw-r--r--version.inc2
2 files changed, 23 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index f27410d3e..f28021b60 100755
--- a/boot.php
+++ b/boot.php
@@ -290,6 +290,14 @@ 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
*/
@@ -744,6 +752,18 @@ class App {
}
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;
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');
+ 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
// 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.
diff --git a/version.inc b/version.inc
index 41f5190b7..e6cafa871 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2013-08-24.415
+2013-08-25.416