Merge branch 'develop' of github.com:SamMousa/LimeSurvey into feature…

…-response-series
LimeSurvey · Apr 8, 2015 · 22ac318 · 22ac318
2 parents e487f26 + a9d1c77
commit 22ac318
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/application/models/installer/PreCheck.php b/application/models/installer/PreCheck.php
@@ -24,7 +24,7 @@ public function getMemoryLimit() {
     }
 
     public function getPdoSupport() {
-        return count(PDO::getAvailableDrivers()) > 0;
+        return implode(",",PDO::getAvailableDrivers());
     }
 
     public function getMultiByteSupport() {
@@ -36,11 +36,11 @@ public function getConfigPath() {
     }
 
     public function getUploadPath() {
-        return Yii::getPathOfAlias('application') . '/../upload';
+        return Yii::getPathOfAlias('webroot') . '/upload';
     }
 
     public function getTempPath() {
-        return Yii::getPathOfAlias('application') . '/../upload';
+        return Yii::getPathOfAlias('webroot') . '/tmp';
     }
 
     public function getZipSupport() {
@@ -281,4 +281,4 @@ public function attributeNames() {
         }, $getters));
     }
 
-}
+}
diff --git a/application/views/installer/precheck.php b/application/views/installer/precheck.php
@@ -10,10 +10,9 @@
             echo CHtml::openTag('div', ['class' => 'col-sm-9']);
             echo CHtml::openTag('div', ['class' => 'form-control']);
             $current = $preCheck->$attribute;
-            if (is_bool($current)) {
-                echo TbHtml::icon($current ? TbHtml::ICON_OK : TbHtml::ICON_REMOVE);
-            } else {
-                echo $current;
+            echo TbHtml::icon(empty($errors) ? TbHtml::ICON_OK : TbHtml::ICON_REMOVE);
+            if (!is_bool($current)) {
+                echo " ".$current;
             }
 
             echo CHtml::closeTag('div');
@@ -55,4 +54,4 @@
 
 </div>
 <?php 
-    echo CHtml::endForm();
+    echo CHtml::endForm();