clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3048 from ddorian1/develop 

Fix test for static calls with PHP 7
This commit is contained in:
Michael Vogel 2016-12-29 11:14:14 +01:00 committed by GitHub
parent d830f506f2 8e2fc0f8a9
commit 1d0cb0f7d2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
boot.php
View File

@ -809,7 +809,7 @@ class App {
function get_baseurl($ssl = false) { function get_baseurl($ssl = false) {
// Is the function called statically? // Is the function called statically?
if (!is_object($this)) { if (!(isset($this) && get_class($this) == __CLASS__)) {
return self::$a->get_baseurl($ssl); return self::$a->get_baseurl($ssl);
} }
@ -1053,7 +1053,7 @@ class App {
function remove_baseurl($orig_url){ function remove_baseurl($orig_url){
// Is the function called statically? // Is the function called statically?
if (!is_object($this)) { if (!(isset($this) && get_class($this) == __CLASS__)) {
return(self::$a->remove_baseurl($orig_url)); return(self::$a->remove_baseurl($orig_url));
} }