Fixed issue 10807: Meaningless error message 'surveytablecreation' wh…

…en survey cannot be activated due to too many questions
LimeSurvey · Mar 21, 2016 · 46de91b · 46de91b
1 parent 4a8b70d
commit 46de91b
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -659,15 +659,18 @@ public function activate($iSurveyID)
                 $aViewUrls['output']= "<br />\n<div class='messagebox ui-corner-all'>\n";
                 if ($aResult['error']=='surveytablecreation')
                 {
-                    $aViewUrls['output'].="<div class='alert alert-warning' role='alert'>".gT("Survey table could not be created.")."</div>\n";
+                    $aViewUrls['output'].="<div class='alert alert-warning' role='alert'>".gT("The survey response table could not be created.")." ".gT("Usually this is caused by having too many (sub-)questions in your survey. Please try removing questions from your survey.")."</div>\n";
                 }
                 else
                 {
                     $aViewUrls['output'].="<div class='alert alert-success' role='alert'>".gT("Timings table could not be created.")."</div>\n";
                 }
-                $aViewUrls['output'].="<strong class='text-warning'>" .
-                gT("Database error!!")."\n " ."\n" .
-                "<pre>".var_export ($aResult['error'],true)."</pre>\n
+                if(App()->getConfig('debug')) {
+                    $aViewUrls['output'].="<strong class='text-warning'>" .
+                    gT("Database error!!")."\n " ."\n" .
+                    "<pre>".var_export ($aResult['error'],true)."</pre>\n
+                }
+
                 <a href='".Yii::app()->getController()->createUrl("admin/survey/sa/view/surveyid/".$iSurveyID)."'>".gT("Main Admin Screen")."</a>\n</strong><br/>" ;
             }
             else