From 302fc3c3b03dacc1c2f58206de3df4c0f845abed Mon Sep 17 00:00:00 2001 From: wangchunsheng Date: Tue, 1 Nov 2011 01:12:42 +0000 Subject: [PATCH] * fix the error of projects and products. --- module/company/control.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/module/company/control.php b/module/company/control.php index c186bc2fc7..b5c0673516 100644 --- a/module/company/control.php +++ b/module/company/control.php @@ -179,11 +179,11 @@ class company extends control /* Get products' list.*/ $products = $this->loadModel('product')->getPairs(); - $products = array_merge(array($this->lang->product->select), $products); + $products = array($this->lang->product->select) + $products; /* Get projects' list.*/ $projects = $this->loadModel('project')->getPairs(); - $projects = array_merge(array($this->lang->project->select), $projects); + $projects = array($this->lang->project->select) + $projects; /* Get users.*/ $users = $this->loadModel('user')->getPairs('nodeleted|noletter');