Cast sounds to string.
authorJan Schneider <jan@horde.org>
Wed, 14 Apr 2010 10:23:51 +0000 (12:23 +0200)
committerJan Schneider <jan@horde.org>
Wed, 14 Apr 2010 10:36:31 +0000 (12:36 +0200)
kronolith/lib/Event.php
nag/lib/Task.php

index cd46241..438d45e 100644 (file)
@@ -1400,11 +1400,11 @@ abstract class Kronolith_Event
             if (!empty($methods['notify']['sound'])) {
                 if ($methods['notify']['sound'] == 'on') {
                     // Handle boolean sound preferences.
-                    $methods['notify']['sound'] = Horde_Themes::sound('theetone.wav');
+                    $methods['notify']['sound'] = (string)Horde_Themes::sound('theetone.wav');
                 } else {
                     // Else we know we have a sound name that can be
                     // served from Horde.
-                    $methods['notify']['sound'] = Horde_Themes::sound($methods['notify']['sound']);
+                    $methods['notify']['sound'] = (string)Horde_Themes::sound($methods['notify']['sound']);
                 }
             }
             if ($this->isAllDay()) {
index 0bba901..3527412 100644 (file)
@@ -751,11 +751,11 @@ class Nag_Task {
             if (!empty($methods['notify']['sound'])) {
                 if ($methods['notify']['sound'] == 'on') {
                     // Handle boolean sound preferences;
-                    $methods['notify']['sound'] = Horde_Themes::sound('theetone.wav');
+                    $methods['notify']['sound'] = (string)Horde_Themes::sound('theetone.wav');
                 } else {
                     // Else we know we have a sound name that can be
                     // served from Horde.
-                    $methods['notify']['sound'] = Horde_Themes::sound($methods['notify']['sound']);
+                    $methods['notify']['sound'] = (string)Horde_Themes::sound($methods['notify']['sound']);
                 }
             }
         }