diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php index 419dd0725..4b11e6d60 100644 --- a/SeedDMS_Core/Core/inc.ClassDMS.php +++ b/SeedDMS_Core/Core/inc.ClassDMS.php @@ -1257,7 +1257,7 @@ class SeedDMS_Core_DMS { $users = array(); for ($i = 0; $i < count($resArr); $i++) { - $user = new SeedDMS_Core_User($resArr[$i]["id"], $resArr[$i]["login"], $resArr[$i]["pwd"], $resArr[$i]["fullName"], $resArr[$i]["email"], (isset($resArr["language"])?$resArr["language"]:NULL), (isset($resArr["theme"])?$resArr["theme"]:NULL), $resArr[$i]["comment"], $resArr[$i]["role"], $resArr[$i]["hidden"], $resArr[$i]["disabled"], $resArr[$i]["pwdExpiration"], $resArr[$i]["loginfailures"], $resArr[$i]["quota"], $resArr[$i]["homefolder"]); + $user = new SeedDMS_Core_User($resArr[$i]["id"], $resArr[$i]["login"], $resArr[$i]["pwd"], $resArr[$i]["fullName"], $resArr[$i]["email"], (isset($resArr[$i]["language"])?$resArr[$i]["language"]:NULL), (isset($resArr[$i]["theme"])?$resArr[$i]["theme"]:NULL), $resArr[$i]["comment"], $resArr[$i]["role"], $resArr[$i]["hidden"], $resArr[$i]["disabled"], $resArr[$i]["pwdExpiration"], $resArr[$i]["loginfailures"], $resArr[$i]["quota"], $resArr[$i]["homefolder"]); $user->setDMS($this); $users[$i] = $user; } diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml index 90852c87a..dc1540ca7 100644 --- a/SeedDMS_Core/package.xml +++ b/SeedDMS_Core/package.xml @@ -12,11 +12,11 @@ uwe@steinmann.cx yes - 2015-01-29 + 2015-02-05 - 4.3.14 - 4.3.14 + 4.3.15 + 4.3.15 stable @@ -24,8 +24,7 @@ GPL License -- add missing start transaction in SeedDMD_Core_Folder::remove() -- SeedDMD_Core_Folder::isSubFolder() doesn't compare object instances anymore (Bug #194) +users returned by SeedDMS_Core_DMS::getAllUsers() have language and theme set again @@ -769,5 +768,20 @@ new release - new methode SeedDMS_Core_Document::replaceContent() which replaces the content of a version. + + + 4.3.14 + 4.3.14 + + + stable + stable + + GPL License + +- add missing start transaction in SeedDMD_Core_Folder::remove() +- SeedDMD_Core_Folder::isSubFolder() doesn't compare object instances anymore (Bug #194) + + diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index ef69d5b3c..96b2d1e64 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -102,13 +102,17 @@ $(document).ready(function() { // Retrieve a list of all users and groups that have review / approve // privileges. $docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp); - $this->contentSubHeading(getMLText("document_infos")); ?>
+ + + diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index e0f9eb9d7..417ba0c01 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -1396,7 +1396,7 @@ $('#delete-document-btn-".$docid."').popover({ title: '".getMLText("rm_document")."', placement: 'left', html: true, - content: \"
".getMLText("confirm_rm_document", array ("documentname" => htmlspecialchars($document->getName(), ENT_QUOTES)))."
\"}); + content: \"
".htmlspecialchars(getMLText("confirm_rm_document", array ("documentname" => $document->getName())), ENT_QUOTES)."
\"}); "); if($return) return $content; @@ -1425,7 +1425,7 @@ $('#delete-folder-btn-".$folderid."').popover({ title: '".getMLText("rm_folder")."', placement: 'left', html: true, - content: \"
".getMLText("confirm_rm_folder", array ("foldername" => htmlspecialchars($folder->getName(), ENT_QUOTES)))."
\"}); + content: \"
".htmlspecialchars(getMLText("confirm_rm_folder", array ("foldername" => $folder->getName())), ENT_QUOTES)."
\"}); "); if($return) return $content;
+ contentSubHeading(getMLText("document_infos")); ?> +
: