mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 00:54:15 +01:00
fix Scrutinizer bug: Api\Etemplate\Exception does not exist (missing \Exception) and remove old non-static stuff from Api\Etemplate\Widget::setElementAttribute(), as $this is allways unset for methods declared static
This commit is contained in:
parent
54bfaeb988
commit
c474df28fb
@ -315,7 +315,7 @@ class Widget
|
|||||||
{
|
{
|
||||||
include_once($path);
|
include_once($path);
|
||||||
}
|
}
|
||||||
catch(Exception $e)
|
catch(\Exception $e)
|
||||||
{
|
{
|
||||||
error_log($e->getMessage());
|
error_log($e->getMessage());
|
||||||
}
|
}
|
||||||
@ -334,7 +334,7 @@ class Widget
|
|||||||
{
|
{
|
||||||
class_exists($class); // trigger autoloader
|
class_exists($class); // trigger autoloader
|
||||||
}
|
}
|
||||||
catch(Exception $e)
|
catch(\Exception $e)
|
||||||
{
|
{
|
||||||
error_log($e->getMessage());
|
error_log($e->getMessage());
|
||||||
}
|
}
|
||||||
@ -961,7 +961,7 @@ class Widget
|
|||||||
{
|
{
|
||||||
//error_log(__METHOD__."('$name', '$attr', ...) request=".get_class(self::$request).", response=".get_class(self::$response).function_backtrace());
|
//error_log(__METHOD__."('$name', '$attr', ...) request=".get_class(self::$request).", response=".get_class(self::$response).function_backtrace());
|
||||||
$ref =& self::$request->modifications[$name][$attr];
|
$ref =& self::$request->modifications[$name][$attr];
|
||||||
if(self::$request && self::$response && (!isset($this) || $val != $this->attrs[$attr]))
|
if(self::$request && self::$response)
|
||||||
{
|
{
|
||||||
// In an AJAX response - automatically add
|
// In an AJAX response - automatically add
|
||||||
self::$response->generic('assign',array(
|
self::$response->generic('assign',array(
|
||||||
@ -974,7 +974,6 @@ class Widget
|
|||||||
self::$request->unset_to_process('');
|
self::$request->unset_to_process('');
|
||||||
//error_log(__METHOD__."('$name', '$attr', ...) ".function_backtrace());
|
//error_log(__METHOD__."('$name', '$attr', ...) ".function_backtrace());
|
||||||
}
|
}
|
||||||
if (isset($this)) $this->attrs[$attr] = $val;
|
|
||||||
if (!is_null($val)) $ref = $val;
|
if (!is_null($val)) $ref = $val;
|
||||||
|
|
||||||
//error_log(__METHOD__."('$name', '$attr', ".array2string($val).')');
|
//error_log(__METHOD__."('$name', '$attr', ".array2string($val).')');
|
||||||
|
Loading…
Reference in New Issue
Block a user