gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-11-26 07:22:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2024-04-27 20:10:06 +02:00
commit b51749e631
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/xmldump.php
View File

@ -682,10 +682,12 @@ $categories = $dms->getDocumentCategories();
if($categories) { if($categories) {
echo "<documentcategories>\n"; echo "<documentcategories>\n";
foreach($categories as $category) { foreach($categories as $category) {
echo " <documentcategory id=\"".$category->getId()."\">\n"; if($category->getId() > 0) {
echo " <attr name=\"name\">".wrapWithCData($category->getName())."</attr>\n"; echo " <documentcategory id=\"".$category->getId()."\">\n";
echo " </documentcategory>\n"; echo " <attr name=\"name\">".wrapWithCData($category->getName())."</attr>\n";
$statistic['documentcategories']++; echo " </documentcategory>\n";
$statistic['documentcategories']++;
}
} }
echo "</documentcategories>\n"; echo "</documentcategories>\n";
} }

4
utils/xmlimport.php
View File

@ -1898,6 +1898,7 @@ if(isset($options['config'])) {
} }
include($myincpath."/inc/inc.Settings.php"); include($myincpath."/inc/inc.Settings.php");
include($myincpath."/inc/inc.Utils.php");
include($myincpath."/inc/inc.Init.php"); include($myincpath."/inc/inc.Init.php");
include($myincpath."/inc/inc.Extension.php"); include($myincpath."/inc/inc.Extension.php");
include($myincpath."/inc/inc.DBInit.php"); include($myincpath."/inc/inc.DBInit.php");
@ -1958,6 +1959,7 @@ if(isset($options['sections'])) {
$sections = explode(',', $options['sections']); $sections = explode(',', $options['sections']);
} }
/*
if(isset($settings->_extraPath)) if(isset($settings->_extraPath))
ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path')); ini_set('include_path', $settings->_extraPath. PATH_SEPARATOR .ini_get('include_path'));
@ -1973,7 +1975,7 @@ if(!$settings->_doNotCheckDBVersion && !$dms->checkVersion()) {
exit; exit;
} }
$dms->setRootFolderID($settings->_rootFolderID); $dms->setRootFolderID($settings->_rootFolderID);
*/
$rootfolder = $dms->getFolder($folderid); $rootfolder = $dms->getFolder($folderid);
if(!$rootfolder) { if(!$rootfolder) {
exit(1); exit(1);