Fixed issue #8406: Upgrade from 1.92 yields Property "Tokens_dynamic.…

…blacklisted" is not defined.
LimeSurvey · Nov 26, 2013 · 71d6d1c · 71d6d1c
1 parent e985aa7
commit 71d6d1c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -672,7 +672,6 @@ function db_upgrade_all($oldversion) {
             addColumn('{{question_attributes}}','language',"{$sVarchar}(20)");
 
             upgradeQuestionAttributes148();
-            upgradeTokens148();
             fixSubquestions();
             Yii::app()->db->createCommand()->update('{{settings_global}}',array('stg_value'=>148),"stg_name='DBVersion'");
         }
@@ -1044,6 +1043,7 @@ function db_upgrade_all($oldversion) {
 
         if ($oldversion < 164)
         {
+            upgradeTokens148(); // this should have bee done in 148 - that's why it is named this way
             // fix survey tables for missing or incorrect token field
             upgradeSurveyTables164();
             Yii::app()->db->createCommand()->update('{{settings_global}}',array('stg_value'=>164),"stg_name='DBVersion'");