From fc300cdf09d0603522018bb86133e29d2dc69e33 Mon Sep 17 00:00:00 2001 From: kevin_fourie Date: Tue, 20 Mar 2007 10:12:28 +0000 Subject: [PATCH] Merged the following bugfixes in from UNSTABLE trunk... --- docs/VERSION-NAME.txt | 2 +- docs/VERSION-OSS.txt | 2 +- plugins/ktstandard/KTBulkExportPlugin.php | 4 ++-- sql/mysql/install/data.sql | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/VERSION-NAME.txt b/docs/VERSION-NAME.txt index 3c7bc7e..89f290e 100644 --- a/docs/VERSION-NAME.txt +++ b/docs/VERSION-NAME.txt @@ -1 +1 @@ -OSS 3.3.3 +OSS 3.3.4 diff --git a/docs/VERSION-OSS.txt b/docs/VERSION-OSS.txt index 619b537..a0891f5 100644 --- a/docs/VERSION-OSS.txt +++ b/docs/VERSION-OSS.txt @@ -1 +1 @@ -3.3.3 +3.3.4 diff --git a/plugins/ktstandard/KTBulkExportPlugin.php b/plugins/ktstandard/KTBulkExportPlugin.php index e4ea4de..defbf1f 100644 --- a/plugins/ktstandard/KTBulkExportPlugin.php +++ b/plugins/ktstandard/KTBulkExportPlugin.php @@ -48,8 +48,8 @@ require_once(KT_LIB_DIR . '/actions/folderaction.inc.php'); class KTBulkExportAction extends KTFolderAction { var $sName = 'ktstandard.bulkexport.action'; - var $sPermissionName = "ktcore.permissions.folder_details"; - var $_sShowPermission = "ktcore.permissions.folder_details"; + var $sPermissionName = "ktcore.permissions.read"; + var $_sShowPermission = "ktcore.permissions.read"; function getDisplayName() { return _kt('Bulk Export'); diff --git a/sql/mysql/install/data.sql b/sql/mysql/install/data.sql index c80739b..58ed5df 100644 --- a/sql/mysql/install/data.sql +++ b/sql/mysql/install/data.sql @@ -1369,7 +1369,7 @@ INSERT INTO `zseq_units_organisations_link` VALUES (1); -- Dumping data for table `zseq_upgrades` -- -INSERT INTO `zseq_upgrades` VALUES (129); +INSERT INTO `zseq_upgrades` VALUES (134); -- -- Dumping data for table `zseq_user_history` -- libgit2 0.21.4