diff --git a/application/config/version.php b/application/config/version.php index b0fce8ed3c4..82036422fbd 100644 --- a/application/config/version.php +++ b/application/config/version.php @@ -13,7 +13,7 @@ */ $config['versionnumber'] = "2.06+"; -$config['dbversionnumber'] = 183; +$config['dbversionnumber'] = 184; $config['buildnumber'] = ''; $config['updatable'] = true; diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php index 5cb108c5d1c..758a08f07a1 100644 --- a/application/helpers/update/updatedb_helper.php +++ b/application/helpers/update/updatedb_helper.php @@ -1307,16 +1307,16 @@ function db_upgrade_all($iOldDBVersion) { upgradeSurveyTables181(); $oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>181),"stg_name='DBVersion'"); } - if ($iOldDBVersion < 182) - { - fixKCFinder182(); - $oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>182),"stg_name='DBVersion'"); - } if ($iOldDBVersion < 183) { upgradeSurveyTables183(); $oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>183),"stg_name='DBVersion'"); } + if ($iOldDBVersion < 184) + { + fixKCFinder184(); + $oDB->createCommand()->update('{{settings_global}}',array('stg_value'=>184),"stg_name='DBVersion'"); + } $oTransaction->commit(); // Activate schema caching $oDB->schemaCachingDuration=3600; @@ -1361,15 +1361,15 @@ function upgradeSurveyTables183() } -function fixKCFinder182() +function fixKCFinder184() { - $sThirdPartyDir=Yii::app()->getConfig('standardtemplaterootdir').DIRECTORY_SEPARATOR.'third_party'.DIRECTORY_SEPARATOR; + $sThirdPartyDir=Yii::app()->getConfig('homedir').DIRECTORY_SEPARATOR.'third_party'.DIRECTORY_SEPARATOR; rmdirr($sThirdPartyDir.'ckeditor/plugins/toolbar'); rmdirr($sThirdPartyDir.'ckeditor/plugins/toolbar/ls-office2003'); array_map('unlink', glob($sThirdPartyDir.'kcfinder/cache/*.js')); array_map('unlink', glob($sThirdPartyDir.'kcfinder/cache/*.css')); rmdirr($sThirdPartyDir.'kcfinder/upload/files'); - rmdirr($sThirdPartyDir.'kcfinder/upload/.htumbs'); + rmdirr($sThirdPartyDir.'kcfinder/upload/.thumbs'); } diff --git a/installer/sql/create-mssql.sql b/installer/sql/create-mssql.sql index e934c240f3b..79687f21824 100644 --- a/installer/sql/create-mssql.sql +++ b/installer/sql/create-mssql.sql @@ -566,4 +566,4 @@ create index [parent_qid_idx] on [prefix_questions] ([parent_qid]); -- -- Version Info -- -INSERT INTO [prefix_settings_global] VALUES ('DBVersion', '183'); +INSERT INTO [prefix_settings_global] VALUES ('DBVersion', '184'); diff --git a/installer/sql/create-mysql.sql b/installer/sql/create-mysql.sql index 1aac1123356..0823666a39c 100644 --- a/installer/sql/create-mysql.sql +++ b/installer/sql/create-mysql.sql @@ -575,4 +575,4 @@ CREATE INDEX `parent_qid_idx` ON `prefix_questions` (`parent_qid`); -- -- Version Info -- -INSERT INTO `prefix_settings_global` VALUES ('DBVersion', '183'); +INSERT INTO `prefix_settings_global` VALUES ('DBVersion', '184'); diff --git a/installer/sql/create-pgsql.sql b/installer/sql/create-pgsql.sql index 49d12dbbb77..596413f0863 100644 --- a/installer/sql/create-pgsql.sql +++ b/installer/sql/create-pgsql.sql @@ -576,4 +576,4 @@ create unique index permissions_idx2 ON prefix_permissions (entity_id, entity, u -- -- Version Info -- -INSERT INTO prefix_settings_global VALUES ('DBVersion', '183'); +INSERT INTO prefix_settings_global VALUES ('DBVersion', '184');