From 7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Fri, 4 Apr 2008 16:44:15 +0000
Subject: Merged with WordPress 2.5, unstable, only for testing

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1218 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/shortcodes.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'wp-includes/shortcodes.php')

diff --git a/wp-includes/shortcodes.php b/wp-includes/shortcodes.php
index 7e3bf44..b90879c 100644
--- a/wp-includes/shortcodes.php
+++ b/wp-includes/shortcodes.php
@@ -118,6 +118,7 @@ function shortcode_parse_atts($text) {
 }
 
 function shortcode_atts($pairs, $atts) {
+	$atts = (array)$atts;
 	$out = array();
 	foreach($pairs as $name => $default) {
 		if ( array_key_exists($name, $atts) )
@@ -128,6 +129,6 @@ function shortcode_atts($pairs, $atts) {
 	return $out;
 }
 
-add_filter('the_content', 'do_shortcode');
+add_filter( 'the_content', 'do_shortcode', 9 );
 
 ?>
-- 
cgit