Fixed issue: Updater not showing new updates

LimeSurvey · Oct 30, 2012 · 55f3b2e · 55f3b2e
1 parent 990918b
commit 55f3b2e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/application/controllers/AdminController.php b/application/controllers/AdminController.php
@@ -408,9 +408,9 @@ public function _showadminmenu($surveyid = false)
             Yii::app()->session['flashmessage'] = $clang->gT("Warning: You are still using the default password ('password'). Please change your password and re-login again.");
         }
 
-        $data['showupdate'] = (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1 && Yii::app()->getConfig("updatelastcheck")>0 && Yii::app()->getConfig("updateavailable")==1 && Yii::app()->getConfig("updatable") );
-        $data['updateversion'] = Yii::app()->getConfig("updateversion");
-        $data['updatebuild'] = Yii::app()->getConfig("updatebuild");
+        $data['showupdate'] = (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1 && getGlobalSetting("updatelastcheck")>0 && getGlobalSetting("updateavailable")==1 && Yii::app()->getConfig("updatable") );
+        $data['updateversion'] = getGlobalSetting("updateversion");
+        $data['updatebuild'] = getGlobalSetting("updatebuild");
         $data['surveyid'] = $surveyid;
         $data['iconsize'] = Yii::app()->getConfig('adminthemeiconsize');
         $data['sImageURL'] = Yii::app()->getConfig('adminimageurl');

diff --git a/application/controllers/admin/globalsettings.php b/application/controllers/admin/globalsettings.php
@@ -53,6 +53,12 @@ public function showphpinfo()
         }
     }
 
+    public function updatecheck()
+    {
+        updateCheck();
+        $this->getController()->redirect('admin/globalsettings');
+    }
+
     private function _displaySettings()
     {
         Yii::app()->loadHelper('surveytranslator');
@@ -69,12 +75,12 @@ private function _displaySettings()
             $data[$key] = $row;
         }
         $data['thisupdatecheckperiod'] = getGlobalSetting('updatecheckperiod');
-        $data['updatelastcheck'] = Yii::app()->getConfig("updatelastcheck");
-        $data['updateavailable'] = (Yii::app()->getConfig("updateavailable") &&  Yii::app()->getConfig("updatable"));
+        $data['updatelastcheck'] = getGlobalSetting("updatelastcheck");
+        $data['updateavailable'] = (getGlobalSetting("updateavailable") &&  Yii::app()->getConfig("updatable"));
         $data['updatable'] = Yii::app()->getConfig("updatable");
-        $data['updateinfo'] = Yii::app()->getConfig("updateinfo");
-        $data['updatebuild'] = Yii::app()->getConfig("updatebuild");
-        $data['updateversion'] = Yii::app()->getConfig("updateversion");
+        $data['updateinfo'] = getGlobalSetting("updateinfo");
+        $data['updatebuild'] = getGlobalSetting("updatebuild");
+        $data['updateversion'] = getGlobalSetting("updateversion");
         $data['allLanguages'] = getLanguageData(false, Yii::app()->session['adminlang']);
         if (trim(Yii::app()->getConfig('restrictToLanguages')) == '') {
             $data['restrictToLanguages'] = array_keys($data['allLanguages']);