Peter M. Groen / knowledgetree

Commit fc300cdf09d0603522018bb86133e29d2dc69e33

Authored by kevin_fourie
1 parent 68bf4372

Merged the following bugfixes in from UNSTABLE trunk... 

KTC-36
"DB error on upgrade from 3.3.2 OSS to 3.3.3 Commercial Edition"
Fixed. The zseq_upgrades must be equal to max(id) on upgrades.

Reviewed By: Jalaloedie Abrahams

KTS-1809
"CLONE -Bulk Export ignores Read permission (SUP-167)"
Fixed. Permisions are now read not folder_details.

Reviewed By: Conrad

Version Bump to 3.3.4.

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6418 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 4 changed files with 5 additions and 5 deletions
docs/VERSION-NAME.txt
  View file @fc300cd
1 -OSS 3.3.3 1 +OSS 3.3.4
docs/VERSION-OSS.txt
  View file @fc300cd
1 -3.3.3 1 +3.3.4
plugins/ktstandard/KTBulkExportPlugin.php
  View file @fc300cd
@@ -48,8 +48,8 @@ require_once(KT_LIB_DIR . '/actions/folderaction.inc.php'); @@ -48,8 +48,8 @@ require_once(KT_LIB_DIR . '/actions/folderaction.inc.php');
48 48
49 class KTBulkExportAction extends KTFolderAction { 49 class KTBulkExportAction extends KTFolderAction {
50 var $sName = 'ktstandard.bulkexport.action'; 50 var $sName = 'ktstandard.bulkexport.action';
51 - var $sPermissionName = "ktcore.permissions.folder_details";  
52 - var $_sShowPermission = "ktcore.permissions.folder_details"; 51 + var $sPermissionName = "ktcore.permissions.read";
  52 + var $_sShowPermission = "ktcore.permissions.read";
53 53
54 function getDisplayName() { 54 function getDisplayName() {
55 return _kt('Bulk Export'); 55 return _kt('Bulk Export');
sql/mysql/install/data.sql
  View file @fc300cd
@@ -1369,7 +1369,7 @@ INSERT INTO `zseq_units_organisations_link` VALUES (1); @@ -1369,7 +1369,7 @@ INSERT INTO `zseq_units_organisations_link` VALUES (1);
1369 -- Dumping data for table `zseq_upgrades` 1369 -- Dumping data for table `zseq_upgrades`
1370 -- 1370 --
1371 1371
1372 -INSERT INTO `zseq_upgrades` VALUES (129); 1372 +INSERT INTO `zseq_upgrades` VALUES (134);
1373 1373
1374 -- 1374 --
1375 -- Dumping data for table `zseq_user_history` 1375 -- Dumping data for table `zseq_user_history`