From 8e2fc0f8a97a6f2cf7573d604a33d0685982daa5 Mon Sep 17 00:00:00 2001 From: Johannes Schwab Date: Tue, 27 Dec 2016 15:47:53 +0100 Subject: [PATCH] Fix test for static calls with PHP 7 --- boot.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/boot.php b/boot.php index aab3498146..db03f9f952 100644 --- a/boot.php +++ b/boot.php @@ -809,7 +809,7 @@ class App { function get_baseurl($ssl = false) { // Is the function called statically? - if (!is_object($this)) { + if (!(isset($this) && get_class($this) == __CLASS__)) { return self::$a->get_baseurl($ssl); } @@ -1053,7 +1053,7 @@ class App { function remove_baseurl($orig_url){ // Is the function called statically? - if (!is_object($this)) { + if (!(isset($this) && get_class($this) == __CLASS__)) { return(self::$a->remove_baseurl($orig_url)); } -- 2.39.5