Peter M. Groen / knowledgetree

Commit 4e94b231bbe764290f8709874e9e6f5ac874ce6d

Authored by kevin_fourie
1 parent 40bc0ad2

Merged in from STABLE trunk... 

KTS-3588
"Remove Admin Version Notifier plugin"
Updated. Upgrades now remove it too.

Committed By: Kevin Fourie
Reviewed By: Conrad Vermeulen


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.3-Release-Branch@9067 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 3 changed files with 21 additions and 3 deletions
lib/upgrades/UpgradeFunctions.inc.php
  View file @4e94b23
... ... @@ -61,7 +61,7 @@ class UpgradeFunctions {
61 61 '3.1.6.3' => array('cleanupGroupMembership'),
62 62 '3.5.0' => array('cleanupOldKTAdminVersionNotifier', 'updateConfigFile35', 'registerIndexingTasks'),
63 63 '3.5.2' => array('setStorageEngine','dropForeignKeys','dropPrimaryKeys','dropIndexes','createPrimaryKeys','createForeignKeys','createIndexes', 'removeSlashesFromObjects'),
64   - '3.5.3' => array('moveConfigSettingsToDB')
  64 + '3.5.3' => array('moveConfigSettingsToDB','removeAdminVersionNotifier')
65 65 );
66 66  
67 67 var $descriptions = array(
... ... @@ -93,6 +93,7 @@ class UpgradeFunctions {
93 93 'createIndexes'=>'Recreate db integrity:Create indexes on the database',
94 94 'removeSlashesFromObjects'=>'Remove slashes from documents and folders',
95 95 'moveConfigSettingsToDB' => 'Move the configuration settings from the config.ini file into the new database table.'
  96 + 'removeAdminVersionNotifier' => 'Remove the old Admin Version Notifier Plugin.'
96 97 );
97 98 var $phases = array(
98 99 "setPermissionFolder" => 1,
... ... @@ -1258,6 +1259,15 @@ class UpgradeFunctions {
1258 1259 $oScheduler->registerTask();
1259 1260 }
1260 1261 // }}}
  1262 +
  1263 + // {{{ removeAdminVersionNotifier
  1264 + function removeAdminVersionNotifier() {
  1265 + global $default;
  1266 + $oldPath = KT_DIR . "/plugins/ktstandard/AdminVersionPlugin";
  1267 +
  1268 + if(file_exists($oldPath)) return rmdir($oldPath);
  1269 + }
  1270 + // }}}
1261 1271 }
1262 1272  
1263 1273 ?>
... ...
sql/mysql/install/data.sql
  View file @4e94b23
... ... @@ -1705,7 +1705,9 @@ INSERT INTO `upgrades` VALUES
1705 1705 (190,'sql*3.5.3*0*3.5.3/doc_checked_out_user_id.sql','Checkedout user ID update.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
1706 1706 (191,'sql*3.5.3*0*3.5.3/indexer_updates.sql','Indexer updates.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
1707 1707 (192,'sql*3.5.3*0*3.5.3/db_optimizations.sql','Database optimizations.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
1708   -(193,'upgrade*3.5.3*99*upgrade3.5.3','Upgrade from version 3.5.2 to 3.5.3','2008-03-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3');
  1708 +(193,'sql*3.5.3*0*3.5.3/del_adminversion_plugin.sql','Remove the old Admin Version Notifier.','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
  1709 +(194,'func*3.5.3*0*removeAdminVersionNotifier','Remove the old Admin Version Notifier files','2008-07-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3'),
  1710 +(195,'upgrade*3.5.3*99*upgrade3.5.3','Upgrade from version 3.5.2 to 3.5.3','2008-03-30 00:00:00',1,'upgrade*3.5.3*99*upgrade3.5.3');
1709 1711 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */;
1710 1712 UNLOCK TABLES;
1711 1713  
... ... @@ -2636,7 +2638,7 @@ UNLOCK TABLES;
2636 2638 LOCK TABLES `zseq_upgrades` WRITE;
2637 2639 /*!40000 ALTER TABLE `zseq_upgrades` DISABLE KEYS */;
2638 2640 INSERT INTO `zseq_upgrades` VALUES
2639   -(193);
  2641 +(195);
2640 2642 /*!40000 ALTER TABLE `zseq_upgrades` ENABLE KEYS */;
2641 2643 UNLOCK TABLES;
2642 2644  
... ...
sql/mysql/upgrade/3.5.3/del_adminversion_plugin.sql 0 → 100644
  View file @4e94b23
  1 +-- Remove from plugins table
  2 +DELETE FROM plugins WHERE namespace = 'ktstandard.adminversion.plugin';
  3 +
  4 +-- Remove from scheduler tasks table
  5 +DELETE FROM scheduler_tasks WHERE script_url = 'plugins/ktstandard/AdminVersionPlugin/bin/UpdateNewVersion.php';
  6 +
... ...