From: Matteo Nastasi (mop) Date: Wed, 21 Nov 2012 15:40:39 +0000 (+0100) Subject: proper way to fix static inheritance bug X-Git-Tag: v4.2.1~2 X-Git-Url: http://mop.ddnsfree.com/gitweb/?a=commitdiff_plain;h=c44fdb25ba51dd26cf59b93ea0edb88331510aab;p=brisk.git proper way to fix static inheritance bug --- diff --git a/web/Obj/user.phh b/web/Obj/user.phh index aed566f..70441e8 100644 --- a/web/Obj/user.phh +++ b/web/Obj/user.phh @@ -481,7 +481,7 @@ class User { /* INDEX_RD_IFRA PORT */ - protected function blocking_error($is_unrecoverable) + static function blocking_error($is_unrecoverable) { log_crit("BLOCKING_ERROR UNREC: ".($is_unrecoverable ? "TRUE" : "FALSE")); return (sprintf(($is_unrecoverable ? 'xstm.stop(); ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("index.php");')); @@ -663,9 +663,9 @@ window.onload = function () { if (xynt_streaming != \"ready\") { xynt_streaming. $body .= sprintf("", 0, escpush($cla::blocking_error($is_unrecoverable)) ); +", 0, escpush(static::blocking_error($is_unrecoverable)) ); // ELSE IF XHR THEN: - // return (self::blocking_error($is_unrecoverable)); + // return (static::blocking_error($is_unrecoverable)); return ($body); } diff --git a/web/briskin5/Obj/briskin5.phh b/web/briskin5/Obj/briskin5.phh index 356c579..8280fd3 100644 --- a/web/briskin5/Obj/briskin5.phh +++ b/web/briskin5/Obj/briskin5.phh @@ -614,7 +614,7 @@ class Bin5_user extends User { return ($ret); } - protected function blocking_error($is_unrecoverable) + static function blocking_error($is_unrecoverable) { log_crit("BLOCKING_ERROR UNREC: ".($is_unrecoverable ? "TRUE" : "FALSE")); return (sprintf(($is_unrecoverable ? 'xstm.stop(); ' : '').'window.onbeforeunload = null; window.onunload = null; document.location.assign("../index.php");'));