holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

using etemplate_new::ajax_proecess_content to allow to have etemplate still extend etemplate_old, making etemplate_new autoloadable

Browse Source
This commit is contained in:
Ralf Becker 2013-08-06 18:24:30 +00:00
parent 54b2596ff8
commit 118657ddee
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/common_functions.inc.php
View File

@ -1495,6 +1495,8 @@ function __autoload($class)
// fixing warnings generated by php 5.3.8 is_a($obj) trying to autoload huge strings // fixing warnings generated by php 5.3.8 is_a($obj) trying to autoload huge strings
if (strlen($class) > 64) return; if (strlen($class) > 64) return;
if ($class == 'etemplate_new') $class = 'etemplate';
$components = explode('_',$class); $components = explode('_',$class);
$app = array_shift($components); $app = array_shift($components);
// classes using the new naming schema app_class_name, eg. admin_cmd // classes using the new naming schema app_class_name, eg. admin_cmd

4
phpgwapi/js/jsapi/egw.js
View File

@ -119,7 +119,7 @@
} }
if(typeof app[window.egw_appName] == "object") if(typeof app[window.egw_appName] == "object")
{ {
callback = function(et2) {app[window.egw_appName].et2_ready(et2)}; callback = function(et2) {app[window.egw_appName].et2_ready(et2);};
} }
var node = document.getElementById(data.DOMNodeID); var node = document.getElementById(data.DOMNodeID);
if(!node) if(!node)
@ -128,7 +128,7 @@
} }
else else
{ {
var et2 = new etemplate2(node, "etemplate::ajax_process_content"); var et2 = new etemplate2(node, "etemplate_new::ajax_process_content");
et2.load(data.name,data.url,data.data,callback); et2.load(data.name,data.url,data.data,callback);
} }
} }