diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-04-04 16:44:15 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-04-04 16:44:15 +0000 |
| commit | 7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc (patch) | |
| tree | c6fd23b598f3994eddb18cb1c0f2e8d95ff054fa /wp-includes/shortcodes.php | |
| parent | f650f48c048bfbbb2ae702b6425d87e39358d748 (diff) | |
| download | wordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.tar.gz wordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.tar.xz wordpress-mu-7740e89de3e1bc0cc636120e3ca8ab9e97e4d3cc.zip | |
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
Diffstat (limited to 'wp-includes/shortcodes.php')
| -rw-r--r-- | wp-includes/shortcodes.php | 3 |
1 files changed, 2 insertions, 1 deletions
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 ); ?> |