diff --git a/Makefile b/Makefile index cc8fefd074..399e35d52f 100644 --- a/Makefile +++ b/Makefile @@ -153,6 +153,9 @@ zentaoxx: sed -i "s/'..\/..\/common\/view\/header.html.php'/\$$app->getModuleRoot() . 'common\/view\/header.html.php'/g" zentaoxx/extension/xuan/conference/view/admin.html.php sed -i "s/'..\/..\/common\/view\/footer.html.php'/\$$app->getModuleRoot() . 'common\/view\/footer.html.php'/g" zentaoxx/extension/xuan/conference/view/admin.html.php sed -i "s/\$$this->im->userGetChangedPassword()/array()/" zentaoxx/extension/xuan/im/control.php + sed -i "/.*->getAllDepts();/d" zentaoxx/extension/xuan/im/ext/bot/default.bot.php + sed -i "s/lang->user->status/lang->user->clientStatus/" zentaoxx/extension/xuan/im/ext/bot/default.bot.php + sed -i "s/.*->getRoleList();/\$$depts = \$$this->im->loadModel('dept')->getDeptPairs();\n\$$deptList = array_map(function(\$$k, \$$v) {return (object)array('id' => \$$k, 'name' => \$$v);}, array_keys(\$$depts), \$$depts);\n\$$roleList = \$$this->im->lang->user->roleList;/" zentaoxx/extension/xuan/im/ext/bot/default.bot.php echo "ALTER TABLE \`zt_user\` ADD \`pinyin\` varchar(255) NOT NULL DEFAULT '' AFTER \`realname\`;" >> zentaoxx/db/xuanxuan.sql mkdir zentaoxx/tools; cp tools/cn2tw.php zentaoxx/tools; cd zentaoxx/tools; php cn2tw.php cp tools/en2other.php zentaoxx/tools; cd zentaoxx/tools; php en2other.php ../ diff --git a/api/v1/entries/taskrecordestimate.php b/api/v1/entries/taskrecordestimate.php index 22e816fe81..e14566cf91 100644 --- a/api/v1/entries/taskrecordestimate.php +++ b/api/v1/entries/taskrecordestimate.php @@ -36,9 +36,7 @@ class taskRecordEstimateEntry extends entry if(!$data) return $this->error('error'); if(isset($data->status) and $data->status == 'fail') return $this->sendError(zget($data, 'code', 400), $data->message); - $effort = new stdclass(); - if($issetEffort and $data->data->efforts) $effort = $data->data->efforts; - if(!$issetEffort and $data->data->estimates) $effort = $data->data->estimates; + $effort = $data->data->efforts ? $data->data->efforts : new stdclass(); return $this->send(200, array('effort' => $effort)); } diff --git a/framework/base/control.class.php b/framework/base/control.class.php index ab6415af38..25dc9fc83d 100644 --- a/framework/base/control.class.php +++ b/framework/base/control.class.php @@ -375,7 +375,7 @@ class baseControl /** * 如果客户端是手机的话,视图文件增加m.前缀。 - * If the clent is mobile, add m. as prefix for view file. + * If the client is mobile, add m. as prefix for view file. * * @access public * @return void diff --git a/framework/base/router.class.php b/framework/base/router.class.php index e1a87cf014..5c51cbe7ef 100644 --- a/framework/base/router.class.php +++ b/framework/base/router.class.php @@ -1081,7 +1081,7 @@ class baseRouter } /** - * 从HTTP_ACCEPT_LANGUAGE中提出去支持的语言。 + * 从HTTP_ACCEPT_LANGUAGE中剔除去支持的语言。 * Parse the lang str from HTTP_ACCEPT_LANGUAGE header. * * @access public diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index d4441262f3..8f50ebf27d 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -19,12 +19,11 @@ branch);?> bug->noExecution);?> bug->noProject);?> -session->bugList ? $app->session->bugList : inlink('browse', "productID=$bug->product");?>