keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix test for static calls with PHP 7

Browse source
This commit is contained in:
Johannes Schwab 2016-12-27 15:47:53 +01:00
parent 94027f19b4
commit 8e2fc0f8a9
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));
} }