mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-08 17:14:44 +01:00
fixing the fix ;)
call_user_func_array(): Argument #1 ($callback) must be a valid callback, class admin_account does not have a method "ajax_process_content"
This commit is contained in:
parent
1d462dabfd
commit
49cac615d7
@ -126,13 +126,6 @@ class Request
|
|||||||
{
|
{
|
||||||
list($appName) = explode('_',$className);
|
list($appName) = explode('_',$className);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check for a real static method, avoid instantiation if it is
|
|
||||||
$m = new ReflectionMethod($className.'::'.$functionName);
|
|
||||||
if($m->isStatic())
|
|
||||||
{
|
|
||||||
$ajaxClass = $className;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -169,6 +162,16 @@ class Request
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Check for a real static method, avoid instantiation if it is
|
||||||
|
if (strpos($menuaction,'::') !== false && strpos($menuaction,'.') === false)
|
||||||
|
{
|
||||||
|
$m = new ReflectionMethod($menuaction);
|
||||||
|
if($m->isStatic())
|
||||||
|
{
|
||||||
|
$ajaxClass = $className;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(substr($className,0,4) != 'ajax' && substr($className,-4) != 'ajax' &&
|
if(substr($className,0,4) != 'ajax' && substr($className,-4) != 'ajax' &&
|
||||||
$menuaction != 'etemplate.etemplate.process_exec' && substr($functionName,0,4) != 'ajax' ||
|
$menuaction != 'etemplate.etemplate.process_exec' && substr($functionName,0,4) != 'ajax' ||
|
||||||
!preg_match('/^[A-Za-z0-9_\\\\-]+(\.[A-Za-z0-9_\\\\]+\.|::)[A-Za-z0-9_]+$/',$menuaction))
|
!preg_match('/^[A-Za-z0-9_\\\\-]+(\.[A-Za-z0-9_\\\\]+\.|::)[A-Za-z0-9_]+$/',$menuaction))
|
||||||
@ -184,7 +187,7 @@ class Request
|
|||||||
{
|
{
|
||||||
$ajaxClass = $GLOBALS['egw']->framework;
|
$ajaxClass = $GLOBALS['egw']->framework;
|
||||||
}
|
}
|
||||||
else if (!$ajaxClass)
|
elseif (!isset($ajaxClass))
|
||||||
{
|
{
|
||||||
$ajaxClass = class_exists($className) ? new $className() : CreateObject($appName.'.'.$className);
|
$ajaxClass = class_exists($className) ? new $className() : CreateObject($appName.'.'.$className);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user