Merge branch 'master' into develop

Conflicts: application/config/version.php application/helpers/expressions/em_core_helper.php application/helpers/expressions/em_manager_helper.php application/helpers/qanda_helper.php
LimeSurvey · Jan 6, 2017 · 0835d09 · 0835d09
2 parents 07cbcc1 + 53de566
commit 0835d09
Show file tree

Hide file tree

Showing 49 changed files with 1,740 additions and 1,547 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -11,11 +11,11 @@
  * See COPYRIGHT.php for copyright notices and details.
  */
 
-$config['versionnumber'] = '3.0.0 alpha (2.57.1 merged)'; /* I don't found actually a better way to have : 'master verion + info it'a develop : ,someone have another idea ? */
+$config['versionnumber'] = '3.0.0-alpha (2.58.0 merged)'; /* I don't found actually a better way to have : 'master verion + info it'a develop : ,someone have another idea ? */
 $config['dbversionnumber'] = 264;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
-$config['assetsversionnumber'] = '45';
+$config['assetsversionnumber'] = '46';
 return $config;
 
 ?>
diff --git a/application/extensions/SettingsWidget/SettingsWidget.php b/application/extensions/SettingsWidget/SettingsWidget.php
@@ -360,7 +360,7 @@ public function renderHtml($name, array $metaData, $form = null)
         $editorOptions = array_merge(array(
             'html' => true,
         ), isset($metaData['editorOptions']) ? $metaData['editorOptions'] : array());
-        return Chtml::tag('div', $htmlOptions,
+        return Chtml::tag('div', array("style"=>'height:auto;width:100%','class'=>'well'),
             $this->widget('yiiwheels.widgets.html5editor.WhHtml5Editor', array(
                 'name' => $name,
                 'value' => $value,

diff --git a/application/helpers/admin/activate_helper.php b/application/helpers/admin/activate_helper.php
@@ -282,10 +282,10 @@ function activateSurvey($iSurveyID, $simulate = false)
     $bCreateSurveyDir=false;
     // Specify case sensitive collations for the token
     $sCollation='';
-    if  (Yii::app()->db->driverName=='mysqli' | Yii::app()->db->driverName=='mysqli'){
-        $sCollation=" COLLATE 'utf8_bin'";
+    if  (Yii::app()->db->driverName=='mysqli' || Yii::app()->db->driverName=='mysql'){
+        $sCollation=" COLLATE 'utf8mb4_bin'";
     }
-    if  (Yii::app()->db->driverName=='sqlsrv' | Yii::app()->db->driverName=='dblib' | Yii::app()->db->driverName=='mssql'){
+    if  (Yii::app()->db->driverName=='sqlsrv' || Yii::app()->db->driverName=='dblib' || Yii::app()->db->driverName=='mssql'){
         $sCollation=" COLLATE SQL_Latin1_General_CP1_CS_AS";
     }
     //Check for any additional fields for this survey and create necessary fields (token and datestamp)