diff --git a/CHANGELOG b/CHANGELOG
index 43c66a3c6..c8c127d04 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+--------------------------------------------------------------------------------
+ Changes in version 4.1.3
+--------------------------------------------------------------------------------
+- fixed setting document link (no more PHP fatal error)
+- fixed typo in variable name which cause a PHP warning when sending the
+ notification mail after updating a folder comment
+- fixed code to determine required approver and reviewer
+
--------------------------------------------------------------------------------
Changes in version 4.1.2
--------------------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 8de0257d2..a6948766a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=4.1.2
+VERSION=4.1.3
SRC=CHANGELOG inc conf utils index.php languages views op out README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install
#restapi webapp
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 041d329bd..dee5164a4 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -225,7 +225,7 @@ class SeedDMS_Core_DMS {
$this->convertFileTypes = array();
$this->version = '@package_version@';
if($this->version[0] == '@')
- $this->version = '4.1.2';
+ $this->version = '4.1.3';
} /* }}} */
function getDB() { /* {{{ */
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 5ff2f3bd7..93bf65580 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,10 +12,10 @@
uwe@steinmann.cx
yes
- 2013-04-05
-
+ 2013-04-08
+
- 4.1.2
+ 4.1.3
4.1.0
@@ -24,7 +24,7 @@
GPL License
-- set propper folderList of sub folders after moving a folder
+- stay in sync with seeddms application
@@ -465,5 +465,21 @@ New release
- stay in sync with seeddms application
+
+ 2013-04-05
+
+
+ 4.1.2
+ 4.1.0
+
+
+ stable
+ stable
+
+ GPL License
+
+- set propper folderList of sub folders after moving a folder
+
+
diff --git a/inc/inc.Utils.php b/inc/inc.Utils.php
index 2492d4174..f5340f320 100644
--- a/inc/inc.Utils.php
+++ b/inc/inc.Utils.php
@@ -326,7 +326,7 @@ function _add_log_line($msg="") { /* {{{ */
function filterDocumentLinks($user, $links) { /* {{{ */
$tmp = array();
foreach ($links as $link)
- if ($link->isPublic() || ($link->getUser()->getID == $user->getID()) || $user->isAdmin())
+ if ($link->isPublic() || ($link->getUser()->getID() == $user->getID()) || $user->isAdmin())
array_push($tmp, $link);
return $tmp;
} /* }}} */
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index fbf4927d0..0fc1809e3 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
class SeedDMS_Version {
- var $_number = "4.1.2";
+ var $_number = "4.1.3";
var $_string = "SeedDMS";
function SeedDMS_Version() {
diff --git a/op/op.EditFolder.php b/op/op.EditFolder.php
index 6c3dd2404..b6418a0d3 100644
--- a/op/op.EditFolder.php
+++ b/op/op.EditFolder.php
@@ -134,7 +134,7 @@ if(($oldcomment = $folder->getComment()) != $comment) {
$params['name'] = $folder->getName();
$params['folder_path'] = $folder->getFolderPathPlain();
$params['old_comment'] = $oldcomment;
- $params['comment'] = $dcomment;
+ $params['comment'] = $comment;
$params['username'] = $user->getFullName();
$params['url'] = "http".((isset($_SERVER['HTTPS']) && (strcmp($_SERVER['HTTPS'],'off')!=0)) ? "s" : "")."://".$_SERVER['HTTP_HOST'].$settings->_httpRoot."out/out.ViewFolder.php?folderid=".$folder->getID();
$params['sitename'] = $settings->_siteName;
diff --git a/views/blue/class.ViewDocument.php b/views/blue/class.ViewDocument.php
index a157f64f3..649edf329 100644
--- a/views/blue/class.ViewDocument.php
+++ b/views/blue/class.ViewDocument.php
@@ -299,7 +299,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Blue_Style {
case 0: // Approver is an individual.
$required = $dms->getUser($a["required"]);
if (!is_object($required)) {
- $reqName = getMLText("unknown_user")." '".$r["required"]."'";
+ $reqName = getMLText("unknown_user")." '".$a["required"]."'";
}
else {
$reqName = htmlspecialchars($required->getFullName());
@@ -310,7 +310,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Blue_Style {
case 1: // Approver is a group.
$required = $dms->getGroup($a["required"]);
if (!is_object($required)) {
- $reqName = getMLText("unknown_group")." '".$r["required"]."'";
+ $reqName = getMLText("unknown_group")." '".$a["required"]."'";
}
else {
$reqName = "".htmlspecialchars($required->getName())."";
diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php
index b9faf82a9..33ad75eaa 100644
--- a/views/bootstrap/class.ViewDocument.php
+++ b/views/bootstrap/class.ViewDocument.php
@@ -493,7 +493,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
case 0: // Approver is an individual.
$required = $dms->getUser($a["required"]);
if (!is_object($required)) {
- $reqName = getMLText("unknown_user")." '".$r["required"]."'";
+ $reqName = getMLText("unknown_user")." '".$a["required"]."'";
}
else {
$reqName = htmlspecialchars($required->getFullName());
@@ -504,7 +504,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
case 1: // Approver is a group.
$required = $dms->getGroup($a["required"]);
if (!is_object($required)) {
- $reqName = getMLText("unknown_group")." '".$r["required"]."'";
+ $reqName = getMLText("unknown_group")." '".$a["required"]."'";
}
else {
$reqName = "".htmlspecialchars($required->getName())."";