From ed3371923aab0fdce0d50955d29e5bdfa44a6840 Mon Sep 17 00:00:00 2001 From: wyd621 Date: Wed, 7 Aug 2013 16:44:41 +0800 Subject: [PATCH 1/3] * fix a bug for webapp pager. --- module/webapp/control.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/webapp/control.php b/module/webapp/control.php index 9bca1db02d..d6932ed716 100644 --- a/module/webapp/control.php +++ b/module/webapp/control.php @@ -57,6 +57,7 @@ class webapp extends control if($type == 'bysearch') $param = helper::safe64Encode($this->post->key); /* Get results from the api. */ + $recPerPage = $this->cookie->pagerWebappObtain ? $this->cookie->pagerWebappObtain : $recPerPage; $results = $this->webapp->getAppsByAPI($type, $param, $recTotal, $recPerPage, $pageID); if($results) { From 8b5d33ef6174669e629b4163335ee6071aaf6362 Mon Sep 17 00:00:00 2001 From: wyd621 Date: Thu, 8 Aug 2013 08:12:25 +0800 Subject: [PATCH 2/3] * fix a bug for get db lang. --- module/custom/control.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/custom/control.php b/module/custom/control.php index fbb0ba8355..378c585e1b 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -56,7 +56,7 @@ class custom extends control $this->view->position[] = $this->lang->custom->common; $this->view->position[] = $this->lang->custom->$module; $this->view->fieldList = $fieldList; - $this->view->dbFields = $this->custom->getItems("module=$module§ion=$field"); + $this->view->dbFields = $this->custom->getItems("lang=$currentLang,all&module=$module§ion=$field"); $this->view->field = $field; $this->view->module = $module; $this->view->currentLang = $currentLang; From 2b4218185251a95c9b799e4c8aa9934f637a6fd9 Mon Sep 17 00:00:00 2001 From: wyd621 Date: Thu, 8 Aug 2013 08:51:02 +0800 Subject: [PATCH 3/3] * init object. --- module/common/model.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/common/model.php b/module/common/model.php index a7f63644cc..a9bd1fa173 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -129,6 +129,7 @@ class commonModel extends model if(!$this->config->db->name) return; $records = $this->loadModel('custom')->getAll(); if(!$records) return; + $this->lang->db = new stdclass(); $this->lang->db->custom = $records; }