Merge branch 'seeddms-4.1.4' into develop

This commit is contained in:
Uwe Steinmann 2013-04-08 20:49:11 +02:00
commit 0c89264f79
2 changed files with 4 additions and 4 deletions

View File

@ -67,7 +67,7 @@ class SeedDMS_Email extends SeedDMS_Notify {
return true; return true;
} /* }}} */ } /* }}} */
function toList($sender, $recipients, $subject, $message, $params) { /* {{{ */ function toList($sender, $recipients, $subject, $message, $params=array()) { /* {{{ */
if ((!is_object($sender) && strcasecmp(get_class($sender), "SeedDMS_Core_User")) || if ((!is_object($sender) && strcasecmp(get_class($sender), "SeedDMS_Core_User")) ||
(!is_array($recipients) && count($recipients)==0)) { (!is_array($recipients) && count($recipients)==0)) {
return -1; return -1;

View File

@ -31,9 +31,9 @@ abstract class SeedDMS_Notify {
*/ */
protected $sender; protected $sender;
abstract function toIndividual($sender, $recipient, $subject, $message, $params); abstract function toIndividual($sender, $recipient, $subject, $message, $params=array());
abstract function toGroup($sender, $groupRecipient, $subject, $message, $params); abstract function toGroup($sender, $groupRecipient, $subject, $message, $params=array());
abstract function toList($sender, $recipients, $subject, $message, $params); abstract function toList($sender, $recipients, $subject, $message, $params=array());
function replaceMarker($text) { function replaceMarker($text) {
global $settings; global $settings;