extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-08 09:05:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

reverting again r27107, as it has to many (unwanted) sideeffects

Browse Source
This commit is contained in:
Ralf Becker 2009-05-24 20:03:28 +00:00
parent 3dadb5abe3
commit 5e9699a5b5
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
etemplate/inc/class.boetemplate.inc.php
View File

@ -426,14 +426,8 @@ class boetemplate extends soetemplate
*/
protected function haveExtension($type,$function='')
{
if (self::$extensions[$type] || $this->loadExtension($type,$ui))
{
if (empty($function)) return true;
return isset(self::$extensions[$type]->public_functions[$function]) ?
self::$extensions[$type]->public_functions[$function] : false;
}
return false;
return (self::$extensions[$type] || $this->loadExtension($type,$ui)) &&
($function == '' || self::$extensions[$type]->public_functions[$function]);
}
/**

4
etemplate/inc/class.etemplate.inc.php
View File

@ -989,7 +989,6 @@ class etemplate extends boetemplate
$readonly = $cell['readonly'] !== false && ($readonly || $cell['readonly']); // might be set or unset (===false) by extension
if (is_null($name)) $name = $cell['name'];
self::set_array($content,$name,$value);
if ($cell['type'] == $type.'-'.$sub_type) break; // stop if no further type-change
@ -1662,8 +1661,7 @@ class etemplate extends boetemplate
break;
}
// extension-processing need to be after all other and only with diff. name
if ($ext_type && !$readonly && ($have = $this->haveExtension($ext_type,'post_process')) &&
($have === true || isset($have[$cell['type']]))) // check if post-process should be used for all sub-types
if ($ext_type && !$readonly && $this->haveExtension($ext_type,'post_process'))
{ // unset it first, if it is already set, to be after the other widgets of the ext.
$to_process = self::$request->get_to_process($form_name);
self::$request->unset_to_process($form_name);