Fixed issue: Problems on upgrade from a previous version

LimeSurvey · Jun 21, 2012 · 738dbe3 · 738dbe3
1 parent cf457d9
commit 738dbe3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
@@ -1659,7 +1659,7 @@ function dropColumn($sTableName, $sColumnName)
     $sDBDriverName=Yii::app()->db->getDriverName();
     if ($sDBDriverName=='mysqli') $sDBDriverName='mysql';
     if ($sDBDriverName=='sqlsrv') $sDBDriverName='mssql';
-    if ($sDBDriverName='mssql')
+    if ($sDBDriverName=='mssql')
     {
         dropDefaultValueMSSQL($sColumnName,$sTableName);
     }
@@ -1674,7 +1674,7 @@ function createTable($sTableName, $aColumns, $aOptions=null)
     $sDBDriverName=Yii::app()->db->getDriverName();
     if ($sDBDriverName=='mysqli') $sDBDriverName='mysql';
     if ($sDBDriverName=='sqlsrv') $sDBDriverName='mssql';
-    if ($sDBDriverName='mssql')
+    if ($sDBDriverName=='mssql')
     {
         foreach ($aColumns as $sName=>&$sType)
         {
@@ -1690,7 +1690,7 @@ function addColumn($sTableName, $sColumn, $sType)
     $sDBDriverName=Yii::app()->db->getDriverName();
     if ($sDBDriverName=='mysqli') $sDBDriverName='mysql';
     if ($sDBDriverName=='sqlsrv') $sDBDriverName='mssql';
-    if ($sDBDriverName='mssql')
+    if ($sDBDriverName=='mssql')
     {
         $sType=str_replace('text','varchar(max)',$sType);
         $sType=str_replace('binary','text',$sType);

diff --git a/application/views/installer/dbconfig_view.php b/application/views/installer/dbconfig_view.php
@@ -41,7 +41,7 @@
                     <tr>
                         <td style="width: 428px;">
                             <b><?php echo CHtml::activeLabelEx($model, 'dbname', array('label' => $clang->gT("Database name"))); ?></b><br />
-                            <div class="description-field"><?php $clang->eT("If you provide an existing database name make sure the database does not contain old tables of LimeSurvey."); ?></div>
+                            <div class="description-field"><?php $clang->eT("If the database not exists it will be created (necessrary permission provided). If there are existing tables then the LimeSurvey database will be upgraded automatically after installation if necessary."); ?></div>
                         </td>
                         <td style="width: 224px;" align="right"><?php echo CHtml::activeTextField($model, 'dbname', array('required' => 'required')) ?></td>
                     </tr>