MFB: Fix sending alarms to multiple users (Bug #8821).

diff --git a/framework/Alarm/Alarm/sql.php b/framework/Alarm/Alarm/sql.php
index c1bcac6..d565c95 100644 (file)
--- a/framework/Alarm/Alarm/sql.php
+++ b/framework/Alarm/Alarm/sql.php
@@ -157,7 +157,7 @@ class Horde_Alarm_sql extends Horde_Alarm {
                 Horde::logMessage($alarm, __FILE__, __LINE__);
                 return $alarm;
             }
-            $alarms[$alarm['alarm_id']] = array(
+            $alarms[] = array(
                 'id' => $alarm['alarm_id'],
                 'user' => $alarm['alarm_uid'],
                 'start' => new Horde_Date($alarm['alarm_start'], 'UTC'),

diff --git a/framework/Alarm/tests/001.phpt b/framework/Alarm/tests/001.phpt
index 814c234..ed10754 100644 (file)
--- a/framework/Alarm/tests/001.phpt
+++ b/framework/Alarm/tests/001.phpt
@@ -122,7 +122,7 @@ array(10) {
 int(0)
 int(1)
 array(2) {
-  ["publicalarm"]=>
+  [0]=>
   array(10) {
     ["id"]=>
     string(11) "publicalarm"
@@ -177,7 +177,7 @@ array(2) {
     ["internal"]=>
     NULL
   }
-  ["personalalarm"]=>
+  [1]=>
   array(10) {
     ["id"]=>
     string(13) "personalalarm"
@@ -235,7 +235,7 @@ array(2) {
 }
 int(1)
 array(1) {
-  ["personalalarm"]=>
+  [0]=>
   array(10) {
     ["id"]=>
     string(13) "personalalarm"
@@ -297,7 +297,7 @@ bool(true)
 array(0) {
 }
 array(1) {
-  ["personalalarm"]=>
+  [0]=>
   array(10) {
     ["id"]=>
     string(13) "personalalarm"
@@ -370,7 +370,7 @@ array(1) {
 }
 int(1)
 array(2) {
-  ["noend"]=>
+  [0]=>
   array(10) {
     ["id"]=>
     string(5) "noend"
@@ -412,7 +412,7 @@ array(2) {
     ["internal"]=>
     NULL
   }
-  ["personalalarm"]=>
+  [1]=>
   array(10) {
     ["id"]=>
     string(13) "personalalarm"

diff --git a/framework/Alarm/tests/setup.inc.dist b/framework/Alarm/tests/setup.inc.dist
index 996437c..761526b 100644 (file)
--- a/framework/Alarm/tests/setup.inc.dist
+++ b/framework/Alarm/tests/setup.inc.dist
@@ -7,7 +7,7 @@ $params = array('phptype' => 'mysql',
 
 require_once 'Log.php';
 $conf['log'] = array('priority' => PEAR_LOG_DEBUG,
-                     'ident' => 'HEADHORDE',
+                     'ident' => 'HORDE',
                      'params' => array('append' => true),
                      'name' => '/tmp/horde.log',
                      'type' => 'file',

diff --git a/horde/docs/CHANGES b/horde/docs/CHANGES
index cba9f8f..1ba8391 100644 (file)
--- a/horde/docs/CHANGES
+++ b/horde/docs/CHANGES
@@ -34,6 +34,7 @@ v4.0-cvs
 v3.3.7-cvs
 ----------
 
+[jan] Fix sending alarms to multiple users (Bug #8821).
 [mms] Fix display of S/MIME certificate data (Bug #8826).
 [mjr] Fix bug in Horde_Image that caused polaroid effect to fail on really old
       ImageMagick versions (earlier then 6.3.2).