extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 04:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check modifications array for attributes too - catches attributes set by app (eg: disabled)

Browse Source
This commit is contained in:
Nathan Gray 2012-07-23 23:48:11 +00:00
parent d37beb2def
commit 9abe56ff94
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etemplate/inc/class.etemplate_widget.inc.php
View File

@ -173,6 +173,13 @@ class etemplate_widget
} }
} }
} }
// Add in anything in the modification array
if(is_array(self::$request->modifications[$this->id]))
{
$this->attrs = array_merge($this->attrs,self::$request->modifications[$this->id]);
}
return $template; return $template;
} }
@ -343,10 +350,8 @@ class etemplate_widget
$expand['cont'] =& self::get_array(self::$request->content, $cname); $expand['cont'] =& self::get_array(self::$request->content, $cname);
$expand['cname'] = $cname; $expand['cname'] = $cname;
} }
if ($respect_disabled && ($disabled = $this->attrs['disabled'])) if ($respect_disabled && ($disabled = $this->attrs['disabled'] || $disabled = self::check_disabled($disabled, $expand)))
{ {
// check if disabled contains @ or !
$disabled = self::check_disabled($disabled, $expand);
if ($disabled) if ($disabled)
{ {
error_log(__METHOD__."('$method_name', ".array2string($params).', '.array2string($respect_disabled).") $this disabled='{$this->attrs['disabled']}'='$disabled': NOT running"); error_log(__METHOD__."('$method_name', ".array2string($params).', '.array2string($respect_disabled).") $this disabled='{$this->attrs['disabled']}'='$disabled': NOT running");