Merge remote-tracking branch 'origin/master'

LimeSurvey · Oct 30, 2012 · aee0a6a · aee0a6a
2 parents 0e37c0e + 91f0944
commit aee0a6a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -274,6 +274,12 @@ public function view($iSurveyID, $gid = null, $qid = null)
         if (isset($qid))
             $qid = sanitize_int($qid);
 
+        // Reinit LEMlang and LEMsid: ensure LEMlang are set to default lang, surveyid are set to this survey id
+        // Ensure Last GetLastPrettyPrintExpression get info from this sid and default lang
+        LimeExpressionManager::SetEMLanguage(Survey::model()->findByPk($iSurveyID)->language);
+        LimeExpressionManager::SetSurveyId($iSurveyID);
+        LimeExpressionManager::StartProcessingPage(false,true);
+
         $aData['surveyid'] = $iSurveyID;
         $aData['gid'] = $gid;
         $aData['qid'] = $qid;

diff --git a/styles/blobblueish/adminstyle.css b/styles/blobblueish/adminstyle.css
@@ -48,7 +48,7 @@ p {
     color: #9C0;
     height: 30px;
     background: #121a28;
-    margin: 0;
+    margin: 0 auto;
     padding: 5px;
     clear: both;
 }