Changeset 2697

Timestamp:

05/28/2008 04:31:04 PM (6 months ago)

Author:

Shadowhand

Message:

Merging r2696 into 2.1.2

Files:

• releases/2.1.2/system/core/Event.php (modified) (5 diffs)

releases/2.1.2/system/core/Event.php

@@ -41 +41 @@
                         self::$events[$name] = array();
                 }
-
-                if ( ! in_array($callback, self::$events[$name], TRUE))
-                {
-                        // Add the event if it does not already exist in the queue
-                        self::$events[$name][] = $callback;
-                }
+                elseif (in_array($callback, self::$events[$name], TRUE))
+                {
+                        // The event already exists
+                        return FALSE;
+                }
+
+                // Add the event
+                self::$events[$name][] = $callback;
 
                 return TRUE;
@@ -67 +69 @@
                 {
                         // Just add the event if there are no events
-                        self::add($name, $callback);
+                        return self::add($name, $callback);
                 }
                 else
                 {
                         // Insert the event immediately before the existing event
-                        self::insert_event($name, $key, $callback);
-                }
-
-                return TRUE;
+                        return self::insert_event($name, $key, $callback);
+                }
         }
 
@@ -94 +94 @@
                 {
                         // Just add the event if there are no events
-                        self::add($name, $callback);
+                        return self::add($name, $callback);
                 }
                 else
                 {
                         // Insert the event immediately after the existing event
-                        self::insert_event($name, $key + 1, $callback);
-                }
-
-                return TRUE;
+                        return self::insert_event($name, $key + 1, $callback);
+                }
         }
 
@@ -115 +113 @@
         private static function insert_event($name, $key, $callback)
         {
+                if (in_array($callback, self::$events[$name], TRUE))
+                        return FALSE;
+
                 // Add the new event at the given key location
                 self::$events[$name] = array_merge
@@ -125 +126 @@
                         array_slice(self::$events[$name], $key)
                 );
+
+                return TRUE;
         }