From 01dd3ac526c69e760b4b8dc04cbcae7af28485a1 Mon Sep 17 00:00:00 2001 From: wyd621 Date: Fri, 2 Aug 2013 10:36:34 +0800 Subject: [PATCH] * fix bug for waring. --- module/admin/config.php | 1 + module/extension/view/obtain.html.php | 2 +- module/report/model.php | 1 + module/sso/config.php | 2 ++ module/sso/control.php | 2 +- 5 files changed, 6 insertions(+), 2 deletions(-) diff --git a/module/admin/config.php b/module/admin/config.php index 0826329d7d..3d72b97363 100644 --- a/module/admin/config.php +++ b/module/admin/config.php @@ -9,6 +9,7 @@ $config->url->extension = 'http://www.zentao.net/extension-browse.html'; $config->url->donation = 'http://www.zentao.net/help-donation.html'; $config->url->service = 'http://www.cnezsoft.com/article-browse-1078.html'; +$config->win2Unix = new stdclass(); $config->win2Unix->renameTables = array( 'zt_casestep' => 'zt_caseStep' , 'zt_doclib' => 'zt_docLib' , diff --git a/module/extension/view/obtain.html.php b/module/extension/view/obtain.html.php index b3a98c7ff9..296ee3d113 100644 --- a/module/extension/view/obtain.html.php +++ b/module/extension/view/obtain.html.php @@ -63,7 +63,7 @@ echo "{$lang->extension->compatible}: {$lang->extension->compatibleList[$currentRelease->compatible]} "; echo "{$lang->extension->grade}: ", html::printStars($extension->stars); echo " {$lang->extension->depends}: "; - if($currentRelease->depends) + if(!empty($currentRelease->depends)) { foreach(json_decode($currentRelease->depends) as $code => $limit) { diff --git a/module/report/model.php b/module/report/model.php index 966d2ca469..f7a5dba3cf 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -288,6 +288,7 @@ EOT; { if($bug->project) { + $projects[$bug->project] = new stdclass(); $projects[$bug->project]->bugs = isset($projects[$bug->project]->bugs) ? $projects[$bug->project]->bugs + 1 : 1; } } diff --git a/module/sso/config.php b/module/sso/config.php index b8c85b1a0c..35f8e1b88b 100644 --- a/module/sso/config.php +++ b/module/sso/config.php @@ -1,3 +1,5 @@ sso->create = new stdclass(); $config->sso->create->requiredFields = 'title,code,key,ip'; +$config->sso->edit = new stdclass(); $config->sso->edit->requiredFields = 'title,key,ip'; diff --git a/module/sso/control.php b/module/sso/control.php index 183863cab7..aae7fcceba 100644 --- a/module/sso/control.php +++ b/module/sso/control.php @@ -9,7 +9,7 @@ class sso extends control */ public function browse() { - $this->view->title = $this->lang->sso->common . $lang->colon . $this->lang->sso->browse; + $this->view->title = $this->lang->sso->common . $this->lang->colon . $this->lang->sso->browse; $this->view->position[] = $this->lang->sso->common; $this->view->position[] = $this->lang->sso->browse; $this->view->auths = $this->sso->getAuths();