diff --git a/framework/model.class.php b/framework/model.class.php index 0c83223166..2287fb1103 100644 --- a/framework/model.class.php +++ b/framework/model.class.php @@ -36,6 +36,22 @@ class model extends baseModel return parent::loadModel($moduleName); } + /** + * 企业版部分功能是从然之合并过来的。ZDOO代码中调用loadTao方法时传递了一个非空的appName,在禅道中会导致错误。 + * 调用父类的loadTao方法来避免这个错误。 + * Some codes merged from ZDOO called the function loadTao with a non-empty appName which causes an error in zentao. + * Call the parent function with empty appName to avoid this error. + * + * @param string $moduleName 模块名,如果为空,使用当前模块。The module name, if empty, use current module's name. + * @param string $appName 应用名,如果为空,使用当前应用。The app name, if empty, use current app's name. + * @access public + * @return object|bool the model object or false if model file not exists. + */ + public function loadTao($moduleName, $appName = '') + { + return parent::loadTao($moduleName); + } + /** * 删除记录 * Delete one record.