Merge branch 'master' into 192_dev

LimeSurvey · Jun 20, 2012 · f2e1c0b · f2e1c0b
2 parents aa512bf + 070d255
commit f2e1c0b
Show file tree

Hide file tree

Showing 71 changed files with 13 additions and 698,913 deletions.
diff --git a/admin/install/create-mssql.sql b/admin/install/create-mssql.sql
@@ -549,7 +549,7 @@ create index [parent_qid_idx] on [prefix_questions] ([parent_qid]);
 --
 -- Version Info
 --
-INSERT INTO [prefix_settings_global] VALUES ('DBVersion', '155.5');
+INSERT INTO [prefix_settings_global] VALUES ('DBVersion', '155.6');
 INSERT INTO [prefix_settings_global] VALUES ('SessionName', '$sessionname');
 
 

diff --git a/admin/install/create-mssqlnative.sql b/admin/install/create-mssqlnative.sql
@@ -553,7 +553,7 @@ create index [parent_qid_idx] on [prefix_questions] ([parent_qid]);
 --
 -- Version Info
 --
-INSERT INTO [prefix_settings_global] VALUES ('DBVersion', '155.5');
+INSERT INTO [prefix_settings_global] VALUES ('DBVersion', '155.6');
 INSERT INTO [prefix_settings_global] VALUES ('SessionName', '$sessionname');
 
 

diff --git a/admin/install/create-mysql.sql b/admin/install/create-mysql.sql
@@ -543,7 +543,7 @@ create index `parent_qid_idx` on `prefix_questions` (`parent_qid`);
 --
 -- Version Info
 --
-INSERT INTO `prefix_settings_global` VALUES ('DBVersion', '155.5');
+INSERT INTO `prefix_settings_global` VALUES ('DBVersion', '155.6');
 INSERT INTO `prefix_settings_global` VALUES ('SessionName', '$sessionname');
 
 

diff --git a/admin/install/create-postgres.sql b/admin/install/create-postgres.sql
@@ -541,7 +541,7 @@ create index parent_qid_idx on prefix_questions (parent_qid);
 --
 -- Version Info
 --
-INSERT INTO prefix_settings_global VALUES ('DBVersion', '155.5');
+INSERT INTO prefix_settings_global VALUES ('DBVersion', '155.6');
 INSERT INTO prefix_settings_global VALUES ('SessionName', '$sessionname');
 
 

diff --git a/admin/update/upgrade-mssql.php b/admin/update/upgrade-mssql.php
@@ -588,10 +588,10 @@ function db_upgrade($oldversion) {
         modify_database("","EXEC sp_rename 'prefix_surveys.showXquestions','showxquestions'"); echo $modifyoutput; flush();@ob_flush();
         modify_database("", "UPDATE [prefix_settings_global] SET [stg_value]='155' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();ob_flush();
     }
-    if ($oldversion < 155.5)
+    if ($oldversion < 155.6)
     {
         LimeExpressionManager::UpgradeConditionsToRelevance();
-        modify_database("", "UPDATE [prefix_settings_global] SET [stg_value]='155.5' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();ob_flush();
+        modify_database("", "UPDATE [prefix_settings_global] SET [stg_value]='155.6' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();ob_flush();
     }
 
     echo '<br /><br />'.sprintf($clang->gT('Database update finished (%s)'),date('Y-m-d H:i:s')).'<br />';

diff --git a/admin/update/upgrade-mssqlnative.php b/admin/update/upgrade-mssqlnative.php
@@ -589,10 +589,10 @@ function db_upgrade($oldversion) {
         modify_database("","EXEC sp_rename 'prefix_surveys.showXquestions','showxquestions'"); echo $modifyoutput; flush();@ob_flush();
         modify_database("", "UPDATE [prefix_settings_global] SET [stg_value]='155' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();ob_flush();
     }
-    if ($oldversion < 155.5)
+    if ($oldversion < 155.6)
     {
         LimeExpressionManager::UpgradeConditionsToRelevance();
-        modify_database("", "UPDATE [prefix_settings_global] SET [stg_value]='155.5' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();ob_flush();
+        modify_database("", "UPDATE [prefix_settings_global] SET [stg_value]='155.6' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();ob_flush();
     }
 
     echo '<br /><br />'.sprintf($clang->gT('Database update finished (%s)'),date('Y-m-d H:i:s')).'<br />';

diff --git a/admin/update/upgrade-mysql.php b/admin/update/upgrade-mysql.php
@@ -697,10 +697,10 @@ function db_upgrade($oldversion) {
 
         modify_database("", "UPDATE `prefix_settings_global` SET stg_value='155' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();ob_flush();
     }
-    if ($oldversion < 155.5)
+    if ($oldversion < 155.6)
     {
         LimeExpressionManager::UpgradeConditionsToRelevance();
-        modify_database("", "UPDATE `prefix_settings_global` SET stg_value='155.5' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();ob_flush();
+        modify_database("", "UPDATE `prefix_settings_global` SET stg_value='155.6' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();ob_flush();
     }
     fixLanguageConsistencyAllSurveys();
     echo '<br /><br />'.sprintf($clang->gT('Database update finished (%s)'),date('Y-m-d H:i:s')).'<br />';

diff --git a/admin/update/upgrade-postgres.php b/admin/update/upgrade-postgres.php
@@ -416,10 +416,10 @@ function db_upgrade($oldversion) {
         modify_database("",'ALTER TABLE prefix_surveys RENAME COLUMN "showXquestions" TO "showxquestions";');
         modify_database("","UPDATE prefix_settings_global SET stg_value='155' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();@ob_flush();
     }
-    if ($oldversion < 155.5)
+    if ($oldversion < 155.6)
     {
         LimeExpressionManager::UpgradeConditionsToRelevance();
-        modify_database("","UPDATE prefix_settings_global SET stg_value='155.5' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();@ob_flush();
+        modify_database("","UPDATE prefix_settings_global SET stg_value='155.6' WHERE stg_name='DBVersion'"); echo $modifyoutput; flush();@ob_flush();
     }
 
     fixLanguageConsistencyAllSurveys();

diff --git a/classes/expressions/LimeExpressionManager.php b/classes/expressions/LimeExpressionManager.php
@@ -883,7 +883,7 @@ public static function ConvertConditionsToRelevance($surveyId=NULL, $qid=NULL)
                 else
                 {
                     // Conditions uses ' ' to mean not answered, but internally it is really stored as ''.  Fix this
-                    if ($value === '" "') {
+                    if ($value === '" "' || $value == '""') {
                         if ($row['method'] == '==')
                         {
                             $relOrList[] = "is_empty(" . $fieldname . ")";