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

This commit is contained in:
Uwe Steinmann 2017-02-13 18:16:50 +01:00
commit 602903de46

View File

@ -1332,7 +1332,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
function addNotify($userOrGroupID, $isUser) { /* {{{ */ function addNotify($userOrGroupID, $isUser) { /* {{{ */
$db = $this->_dms->getDB(); $db = $this->_dms->getDB();
$userOrGroup = ($isUser ? "userID" : "groupID"); $userOrGroup = ($isUser ? "`userID`" : "`groupID`");
/* Verify that user / group exists. */ /* Verify that user / group exists. */
$obj = ($isUser ? $this->_dms->getUser($userOrGroupID) : $this->_dms->getGroup($userOrGroupID)); $obj = ($isUser ? $this->_dms->getUser($userOrGroupID) : $this->_dms->getGroup($userOrGroupID));
@ -1453,7 +1453,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
return -1; return -1;
} }
$userOrGroup = ($isUser) ? "userID" : "groupID"; $userOrGroup = ($isUser) ? "`userID`" : "`groupID`";
/* Verify that the requesting user has permission to add the target to /* Verify that the requesting user has permission to add the target to
* the notification system. * the notification system.