From 786b78a025e2fe337372896c9c48a1ee52fec608 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Fri, 13 Nov 2015 13:27:29 +0800
Subject: [PATCH]  * add 7.4 version.

---
 VERSION                  | 2 +-
 config/config.php        | 2 +-
 module/upgrade/model.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/VERSION b/VERSION
index 03621c112a..5a7c848d30 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.3.stable
+7.4.stable
diff --git a/config/config.php b/config/config.php
index acb69f6a94..2d20b3fba5 100644
--- a/config/config.php
+++ b/config/config.php
@@ -17,7 +17,7 @@ if(!function_exists('getWebRoot')){function getWebRoot(){}}
 
 /* Basic settings. */
 $config = new config();
-$config->version      = '7.3';             // The version of zentaopms. Don't change it.
+$config->version      = '7.4';             // The version of zentaopms. Don't change it.
 $config->charset      = 'UTF-8';           // The charset of zentaopms.
 $config->cookieLife   = time() + 2592000;  // The cookie life time.
 $config->timezone     = 'Asia/Shanghai';   // The time zone setting, for more see http://www.php.net/manual/en/timezones.php
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index d5176caa2e..6e603defc8 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -970,14 +970,14 @@ class upgradeModel extends model
      */
     public function adjustPriv7_4()
     {
-        $groups = $this->dao->select('id')->from(TABLE_GROUP)->where('name')->eq('guest')->fetchAll();
+        $groups = $this->dao->select('id')->from(TABLE_GROUP)->where('name')->ne('guest')->fetchPairs('id', 'id');
         foreach($groups as $groupID)
         {
             $groupPriv = new stdclass();
             $groupPriv->group = $groupID;
             $groupPriv->module = 'my';
             $groupPriv->method = 'unbind';
-            $this->dao->replae(TABLE_GROUPPRIV)->data($data)->exec();
+            $this->dao->replace(TABLE_GROUPPRIV)->data($groupPriv)->exec();
         }
 
         return true;