Fix test for static calls with PHP 7

diff --git a/boot.php b/boot.php
index aab3498146a2b2a423c85c74717958a0aacf4873..db03f9f952bbdf37a2be8ca8d772a38ee4158057 100644 (file)
--- 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));
                }