mirror of
https://git.code.sf.net/p/seeddms/code
synced 2025-05-13 21:21:27 +00:00
Merge branch 'seeddms-5.0.x' into seeddms-5.1.x
This commit is contained in:
commit
27a323a38f
|
@ -1412,7 +1412,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
|
||||||
/* Check to see if user/group is already on the list. */
|
/* Check to see if user/group is already on the list. */
|
||||||
$queryStr = "SELECT * FROM `tblNotify` WHERE `tblNotify`.`target` = '".$this->_id."' ".
|
$queryStr = "SELECT * FROM `tblNotify` WHERE `tblNotify`.`target` = '".$this->_id."' ".
|
||||||
"AND `tblNotify`.`targetType` = '".T_DOCUMENT."' ".
|
"AND `tblNotify`.`targetType` = '".T_DOCUMENT."' ".
|
||||||
"AND `tblNotify`.`".$userOrGroup."` = '".(int) $userOrGroupID."'";
|
"AND `tblNotify`.".$userOrGroup." = '".(int) $userOrGroupID."'";
|
||||||
$resArr = $db->getResultArray($queryStr);
|
$resArr = $db->getResultArray($queryStr);
|
||||||
if (is_bool($resArr)) {
|
if (is_bool($resArr)) {
|
||||||
return -4;
|
return -4;
|
||||||
|
@ -1484,7 +1484,7 @@ class SeedDMS_Core_Document extends SeedDMS_Core_Object { /* {{{ */
|
||||||
/* Check to see if the target is in the database. */
|
/* Check to see if the target is in the database. */
|
||||||
$queryStr = "SELECT * FROM `tblNotify` WHERE `tblNotify`.`target` = '".$this->_id."' ".
|
$queryStr = "SELECT * FROM `tblNotify` WHERE `tblNotify`.`target` = '".$this->_id."' ".
|
||||||
"AND `tblNotify`.`targetType` = '".T_DOCUMENT."' ".
|
"AND `tblNotify`.`targetType` = '".T_DOCUMENT."' ".
|
||||||
"AND `tblNotify`.`".$userOrGroup."` = '".(int) $userOrGroupID."'";
|
"AND `tblNotify`.".$userOrGroup." = '".(int) $userOrGroupID."'";
|
||||||
$resArr = $db->getResultArray($queryStr);
|
$resArr = $db->getResultArray($queryStr);
|
||||||
if (is_bool($resArr)) {
|
if (is_bool($resArr)) {
|
||||||
return -4;
|
return -4;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user