Dev removed $clang global dependency from update*

Dev fixed DBversion - should have been 149 for survey_url_parameters git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@11087 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Oct 3, 2011 · 9dbd7e6 · 9dbd7e6
1 parent c78f40b
commit 9dbd7e6
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -1,7 +1,7 @@
 <?php
 
 $config['versionnumber'] = "2.0alpha";
-$config['dbversionnumber'] = 148;
+$config['dbversionnumber'] = 149;
 $config['buildnumber'] = '';
 
 ?>
diff --git a/application/helpers/update/update_helper.php b/application/helpers/update/update_helper.php
@@ -42,6 +42,7 @@ function CheckForDBUpgrades($subaction = null)
             $tables = $connect->MetaTables();
             db_upgrade_all(intval($currentDBVersion));
             db_upgrade(intval($currentDBVersion));
+            $CI->db->update('settings_global',array('stg_value' => intval($dbversionnumber)),array('stg_name' => 'DBVersion'));
             echo "<br />".sprintf($clang->gT("Database has been successfully upgraded to version %s"),$dbversionnumber);
 			echo "<br /><a href='".site_url("admin")."'>".$clang->gT("Back to main menu")."</a></div>";
         }

diff --git a/application/helpers/update/upgrade-all_helper.php b/application/helpers/update/upgrade-all_helper.php
@@ -20,9 +20,10 @@
 function db_upgrade_all($oldversion) {
     /// This function does anything necessary to upgrade
     /// older versions to match current functionality
-    global $modifyoutput, $dbprefix, $usertemplaterootdir, $standardtemplaterootdir, $clang;
+    global $modifyoutput, $dbprefix, $usertemplaterootdir, $standardtemplaterootdir;
     $CI =& get_instance();
     $CI->load->dbforge();
+    $clang = $CI->limesurvey_lang;
     echo str_pad($clang->gT('The LimeSurvey database is being upgraded').' ('.date('Y-m-d H:i:s').')',14096).".". $clang->gT('Please be patient...')."<br /><br />\n";
 
     if ($oldversion < 143)
@@ -54,7 +55,7 @@ function db_upgrade_all($oldversion) {
         closedir($myDirectory);
 
     }
-    if ($oldversion < 148)
+    if ($oldversion < 149)
     {
         $CI->dbforge->add_field('id');
         $fields = array(

diff --git a/application/helpers/update/upgrade-mssql_helper.php b/application/helpers/update/upgrade-mssql_helper.php
@@ -20,7 +20,9 @@
 function db_upgrade($oldversion) {
     /// This function does anything necessary to upgrade
     /// older versions to match current functionality
-    global $modifyoutput, $dbprefix, $clang;
+    global $modifyoutput, $dbprefix;
+    $CI =& get_instance();
+    $clang = $CI->limesurvey_lang;
     if ($oldversion < 111) {
 
         // Language upgrades from version 110 to 111 since the language names did change

diff --git a/application/helpers/update/upgrade-mssqlnative_helper.php b/application/helpers/update/upgrade-mssqlnative_helper.php
@@ -20,7 +20,9 @@
 function db_upgrade($oldversion) {
 /// This function does anything necessary to upgrade
 /// older versions to match current functionality
-    global $modifyoutput, $dbprefix, $clang;
+    global $modifyoutput, $dbprefix;
+    $CI =& get_instance();
+    $clang = $CI->limesurvey_lang;
     if ($oldversion < 111) {
 
     // Language upgrades from version 110 to 111 since the language names did change

diff --git a/application/helpers/update/upgrade-mysql_helper.php b/application/helpers/update/upgrade-mysql_helper.php
@@ -20,7 +20,9 @@
 function db_upgrade($oldversion) {
     /// This function does anything necessary to upgrade
     /// older versions to match current functionality
-    global $modifyoutput, $databasename, $databasetabletype, $connect, $clang;
+    global $modifyoutput, $databasename, $databasetabletype, $connect;
+    $CI =& get_instance();
+    $clang = $CI->limesurvey_lang;
     if ($oldversion < 111) {
         // Language upgrades from version 110 to 111 since the language names did change
 

diff --git a/application/helpers/update/upgrade-postgres_helper.php b/application/helpers/update/upgrade-postgres_helper.php
@@ -18,7 +18,9 @@
 // For this there will be a settings table which holds the last time the database was upgraded
 
 function db_upgrade($oldversion) {
-    global $modifyoutput, $databasename, $databasetabletype, $clang;
+    global $modifyoutput, $databasename, $databasetabletype;
+    $CI =& get_instance();
+    $clang = $CI->limesurvey_lang;
 
 
     if ($oldversion < 127) {