diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-13 11:48:42 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-10-13 11:48:42 -0700 |
| commit | d9720b77e9c4455df3e3237c285ad5a33afdd591 (patch) | |
| tree | 2d2d7f918b9e7af7d312d7bc08f05fce0e4c528f /modules/notification/helpers/notification.php | |
| parent | 4dd6e4cc4c3353b36a5c69a845ad879ddf085d2f (diff) | |
| parent | 53393a144609c0d8402b14606f52422bf3f28daf (diff) | |
Merge branch 'master' into talmdal_dev
Conflicts:
modules/gallery/controllers/admin_users.php
modules/gallery/controllers/password.php
modules/gallery/helpers/group.php
modules/gallery/helpers/user.php
modules/notification/helpers/notification.php
Diffstat (limited to 'modules/notification/helpers/notification.php')
| -rw-r--r-- | modules/notification/helpers/notification.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/notification/helpers/notification.php b/modules/notification/helpers/notification.php index 8cf9f428..150616ab 100644 --- a/modules/notification/helpers/notification.php +++ b/modules/notification/helpers/notification.php @@ -79,8 +79,8 @@ class notification { $subscriber_ids[] = $subscriber->user_id; } - $users = user::users(array("in" => array("id", $subscriber_ids), - "where" => array("email IS NOT" => null))); + $users = user::get_user_list(array("in" => array("id", $subscriber_ids), + "where" => array("email IS NOT" => null))); $subscribers = array(); foreach ($users as $user) { |