diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-08-13 15:13:05 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-08-13 15:13:05 +0000 |
| commit | bfa3b629e0d67016ec83050c5db762479af40609 (patch) | |
| tree | 4c9ae204172d0fad3ae056ccc65ffe9ea91134d2 /wp-includes/media.php | |
| parent | 7258ea2d7eeedb439607b72a1f74dee98e4b9d12 (diff) | |
| download | wordpress-mu-bfa3b629e0d67016ec83050c5db762479af40609.tar.gz wordpress-mu-bfa3b629e0d67016ec83050c5db762479af40609.tar.xz wordpress-mu-bfa3b629e0d67016ec83050c5db762479af40609.zip | |
Merge with WP revision 8635
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1421 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/media.php')
| -rw-r--r-- | wp-includes/media.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/wp-includes/media.php b/wp-includes/media.php index dd6927b..36ca595 100644 --- a/wp-includes/media.php +++ b/wp-includes/media.php @@ -355,9 +355,6 @@ add_shortcode('caption', 'img_caption_shortcode'); function img_caption_shortcode($attr, $content = null) { - if ( defined('CAPTIONS_OFF') && true == CAPTIONS_OFF ) - return $content; - // Allow plugins/themes to override the default caption template. $output = apply_filters('img_caption_shortcode', '', $attr, $content); if ( $output != '' ) |