From dde873899974f9fb473f10b93ede74587dbc08fb Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 28 Jan 2013 11:30:28 +0100 Subject: [PATCH] Qual: Add a protection to detect bad usage of getStaticMember --- htdocs/core/lib/functions.lib.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 3a17c270544..fa0a1c22619 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -51,15 +51,18 @@ function getStaticMember($class, $member) $classObj = new ReflectionClass($class); $result = null; + $found=0; foreach($classObj->getStaticProperties() as $prop => $value) { - if($prop == $member) + if ($prop == $member) { $result = $value; + $found++; break; } } + if (! $found) dol_print_error('','Try to get a static member "'.$member.'" in class "'.$class.'" that does not exists or is not static.'); return $result; } @@ -2122,7 +2125,7 @@ function dol_print_error($db='',$error='') $out.="
\n"; $out.="".$langs->trans("RequestedUrl").": ".$_SERVER["REQUEST_URI"]."
\n";; $out.="".$langs->trans("Referer").": ".(isset($_SERVER["HTTP_REFERER"])?$_SERVER["HTTP_REFERER"]:'')."
\n";; - $out.="".$langs->trans("MenuManager").": ".$conf->standard_menu."
\n"; + $out.="".$langs->trans("MenuManager").": ".(isset($conf->standard_menu)?$conf->standard_menu:'')."
\n"; $out.="
\n"; $syslog.="url=".$_SERVER["REQUEST_URI"]; $syslog.=", query_string=".$_SERVER["QUERY_STRING"];