Flipping merge items to be a static method.

simplepie · Sep 22, 2011 · bb9fc11 · bb9fc11
1 parent e424f3b
commit bb9fc11
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/SimplePie/Core.php b/SimplePie/Core.php
@@ -2788,7 +2788,7 @@ public function sort_items($a, $b)
 	/**
 	 * @static
 	 */
-	public function merge_items($urls, $start = 0, $end = 0, $limit = 0)
+	public static function merge_items($urls, $start = 0, $end = 0, $limit = 0)
 	{
 		if (is_array($urls) && sizeof($urls) > 0)
 		{