Merge branch 'dev' of https://github.com/MoriTanosuke/wallabag into MoriTanosuke-dev

2015-06-29 15:29:18 +02:00
parent 9786dbf165 6e22fc17d2
commit a754e1c3f0
2 changed files with 15 additions and 2 deletions
--- a/inc/poche/Tools.class.php
+++ b/inc/poche/Tools.class.php
@ -72,8 +72,14 @@ final class Tools
            $serverport = '';
        }

-        return 'http' . ($https ? 's' : '') . '://'
-            . $host . $serverport . $scriptname;
+	// check if BASE_URL is configured
+	if(BASE_URL != null && BASE_URL != '') {
+		$baseUrl = BASE_URL;
+	} else {
+		$baseUrl = 'http' . ($https ? 's' : '') . '://' . $host . $serverport;
+	}
+
+        return $baseUrl . $scriptname;
    }

    /**