From: Edward Z. Yang Date: Thu, 26 Apr 2012 02:47:39 +0000 (-0400) Subject: WordPress 3.3.2 X-Git-Tag: wordpress-3.3.2 X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/commitdiff_plain/refs/tags/wordpress-3.3.2 WordPress 3.3.2 Signed-off-by: Edward Z. Yang --- diff --git a/readme.html b/readme.html index 66c102f7..8980b379 100644 --- a/readme.html +++ b/readme.html @@ -8,7 +8,7 @@

WordPress -
Version 3.3.1 +
Version 3.3.2

Semantic Personal Publishing Platform

diff --git a/wp-admin/about.php b/wp-admin/about.php index 470b5579..1ebc0f0d 100644 --- a/wp-admin/about.php +++ b/wp-admin/about.php @@ -34,7 +34,11 @@ include( './admin-header.php' );
-

+

+

Version %1$s addressed some security issues and fixed %2$s bug.', + 'Version %1$s addressed some security issues and fixed %2$s bugs.', 12 ), '3.3.2', number_format_i18n( 12 ) ); ?> + the release notes.' ), 'http://codex.wordpress.org/Version_3.3.2' ); ?> +

Version %1$s addressed a security issue and fixed %2$s bug.', 'Version %1$s addressed a security issue and fixed %2$s bugs.', 15 ), '3.3.1', number_format_i18n( 15 ) ); ?> the release notes.' ), 'http://codex.wordpress.org/Version_3.3.1' ); ?> diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php index 46979d78..185e0258 100644 --- a/wp-admin/includes/update-core.php +++ b/wp-admin/includes/update-core.php @@ -406,7 +406,7 @@ function update_core($from, $to) { $mysql_version = $wpdb->db_version(); $required_php_version = '5.2.4'; $required_mysql_version = '5.0'; - $wp_version = '3.3.1'; + $wp_version = '3.3.2'; $php_compat = version_compare( $php_version, $required_php_version, '>=' ); if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) $mysql_compat = true; diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php index 00b53afe..d339899b 100644 --- a/wp-admin/plugins.php +++ b/wp-admin/plugins.php @@ -154,6 +154,10 @@ if ( $action ) { wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.')); check_admin_referer('deactivate-plugin_' . $plugin); + if ( ! is_network_admin() && is_plugin_active_for_network( $plugin ) ) { + wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") ); + exit; + } deactivate_plugins($plugin); update_option('recently_activated', array($plugin => time()) + (array)get_option('recently_activated')); if ( headers_sent() ) @@ -169,7 +173,13 @@ if ( $action ) { check_admin_referer('bulk-plugins'); $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked'] : array(); - $plugins = array_filter($plugins, 'is_plugin_active'); //Do not deactivate plugins which are already deactivated. + // Do not deactivate plugins which are already deactivated. + if ( is_network_admin() ) { + $plugins = array_filter( $plugins, 'is_plugin_active_for_network' ); + } else { + $plugins = array_filter( $plugins, 'is_plugin_active' ); + $plugins = array_diff( $plugins, array_filter( $plugins, 'is_plugin_active_for_network' ) ); + } if ( empty($plugins) ) { wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") ); exit; diff --git a/wp-admin/press-this.php b/wp-admin/press-this.php index f368b213..b8402529 100644 --- a/wp-admin/press-this.php +++ b/wp-admin/press-this.php @@ -390,24 +390,15 @@ var photostorage = false; function setup_photo_actions() { jQuery('.close').click(function() { jQuery('#extra-fields').hide(); - jQuery('body').append( jQuery('#photo-add-url-div') ); jQuery('#extra-fields').html(''); }); jQuery('.refresh').click(function() { photostorage = false; - jQuery('body').append( jQuery('#photo-add-url-div') ); show('photo'); }); jQuery('#photo-add-url').click(function(){ - var container = jQuery('#img_container'); - - if ( container.children('#photo-add-url-div:visible').length ) { - container.children('a').show(); - jQuery('#photo-add-url-div').hide(); - } else { - container.children('a').hide(); - container.append( jQuery('#photo-add-url-div').show() ); - } + var form = jQuery('#photo-add-url-div').clone(); + jQuery('#img_container').empty().append( form.show() ); }); jQuery('#waiting').hide(); jQuery('#extra-fields').show(); diff --git a/wp-admin/setup-config.php b/wp-admin/setup-config.php index efc158fc..e3067ac7 100644 --- a/wp-admin/setup-config.php +++ b/wp-admin/setup-config.php @@ -44,10 +44,13 @@ define('WP_DEBUG', false); require_once(ABSPATH . WPINC . '/load.php'); require_once(ABSPATH . WPINC . '/version.php'); wp_check_php_mysql_versions(); +wp_unregister_GLOBALS(); require_once(ABSPATH . WPINC . '/compat.php'); require_once(ABSPATH . WPINC . '/functions.php'); require_once(ABSPATH . WPINC . '/class-wp-error.php'); +require_once(ABSPATH . WPINC . '/formatting.php'); +wp_magic_quotes(); if (!file_exists(ABSPATH . 'wp-config-sample.php')) wp_die('Sorry, I need a wp-config-sample.php file to work from. Please re-upload this file from your WordPress installation.'); diff --git a/wp-comments-post.php b/wp-comments-post.php index 648388f4..9f1dc724 100644 --- a/wp-comments-post.php +++ b/wp-comments-post.php @@ -100,6 +100,6 @@ if ( !$user->ID ) { $location = empty($_POST['redirect_to']) ? get_comment_link($comment_id) : $_POST['redirect_to'] . '#comment-' . $comment_id; $location = apply_filters('comment_post_redirect', $location, $comment); -wp_redirect($location); +wp_safe_redirect( $location ); exit; ?> diff --git a/wp-content/themes/twentyeleven/languages/twentyeleven.pot b/wp-content/themes/twentyeleven/languages/twentyeleven.pot index 77bf8d29..a19b4fbf 100644 --- a/wp-content/themes/twentyeleven/languages/twentyeleven.pot +++ b/wp-content/themes/twentyeleven/languages/twentyeleven.pot @@ -1,200 +1,197 @@ -# Copyright (C) 2010 Twenty Eleven -# This file is distributed under the same license as the Twenty Eleven package. +# Copyright (C) 2012 the WordPress team +# This file is distributed under the GNU General Public License. msgid "" msgstr "" "Project-Id-Version: Twenty Eleven 1.3\n" -"Report-Msgid-Bugs-To: http://wordpress.org/tag/twentyeleven\n" -"POT-Creation-Date: 2011-12-10 19:47:15+00:00\n" +"Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyeleven\n" +"POT-Creation-Date: 2012-02-10 16:30:53+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2012-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -#: content-quote.php:14 showcase.php:115 showcase.php:194 content.php:15 -#: content.php:19 content-image.php:15 content-gallery.php:16 -#: content-gallery.php:48 content-aside.php:16 content-status.php:15 -#: inc/widgets.php:89 content-link.php:16 content-featured.php:14 -msgid "Permalink to %s" +#: 404.php:17 +msgid "This is somewhat embarrassing, isn’t it?" msgstr "" -#: content-quote.php:15 -msgid "Quote" +#: 404.php:21 +msgid "" +"It seems we can’t find what you’re looking for. Perhaps " +"searching, or one of the links below, can help." msgstr "" -#: content-quote.php:24 content.php:30 content-image.php:21 -#: content-aside.php:22 content-status.php:21 content-link.php:22 -msgid "Reply" +#: 404.php:28 +msgid "Most Used Categories" msgstr "" -#: content-quote.php:24 content.php:30 content-image.php:21 -#: content-aside.php:22 content-status.php:21 content-link.php:22 -msgctxt "comments number" -msgid "1" +#. translators: %1$s: smilie +#: 404.php:36 +msgid "Try looking in the monthly archives. %1$s" msgstr "" -#: content-quote.php:24 content.php:30 content-image.php:21 -#: content-aside.php:22 content-status.php:21 content-link.php:22 -msgctxt "comments number" -msgid "%" +#: archive.php:25 +msgid "Daily Archives: %s" msgstr "" -#: content-quote.php:35 content.php:41 content-image.php:27 -#: content-gallery.php:32 content-aside.php:33 functions.php:327 -#: content-status.php:34 content-link.php:33 -msgid "Continue reading →" +#: archive.php:27 +msgid "Monthly Archives: %s" msgstr "" -#: content-quote.php:36 content.php:42 content-image.php:28 -#: content-single.php:24 content-intro.php:18 content-gallery.php:54 -#: content-aside.php:34 image.php:90 content-status.php:35 content-page.php:18 -#: content-link.php:34 content-featured.php:23 -msgid "Pages:" +#: archive.php:27 +msgctxt "monthly archives date format" +msgid "F Y" msgstr "" -#. translators: used between list items, there is a space after the comma -#: content-quote.php:44 content-quote.php:54 content.php:51 content.php:61 -#: content-image.php:47 content-image.php:56 content-single.php:30 -#: content-single.php:33 content-gallery.php:62 content-gallery.php:72 -#: content-featured.php:29 content-featured.php:38 -msgid ", " +#: archive.php:29 +msgid "Yearly Archives: %s" msgstr "" -#: content-quote.php:48 content.php:55 content-image.php:51 -#: content-gallery.php:66 -msgid "Posted in %2$s" +#: archive.php:29 +msgctxt "yearly archives date format" +msgid "Y" msgstr "" -#: content-quote.php:60 content.php:67 content-image.php:59 -#: content-gallery.php:78 -msgid "Tagged %2$s" +#: archive.php:31 +msgid "Blog Archives" msgstr "" -#: content-quote.php:69 showcase.php:196 content.php:77 content-image.php:64 -#: content-gallery.php:87 content-aside.php:42 content-status.php:43 -#: content-link.php:42 -msgid "Leave a reply" +#: archive.php:57 author.php:74 category.php:50 index.php:37 search.php:42 +#: tag.php:50 +msgid "Nothing Found" msgstr "" -#: content-quote.php:69 showcase.php:196 content.php:77 content-image.php:64 -#: content-gallery.php:87 content-aside.php:42 content-status.php:43 -#: content-link.php:42 -msgid "1 Reply" +#: archive.php:61 author.php:78 category.php:54 index.php:41 tag.php:54 +msgid "" +"Apologies, but no results were found for the requested archive. Perhaps " +"searching will help find a related post." msgstr "" -#: content-quote.php:69 showcase.php:196 content.php:77 content-image.php:64 -#: content-gallery.php:87 content-aside.php:42 content-status.php:43 -#: content-link.php:42 -msgid "% Replies" +#: author.php:28 +msgid "Author Archives: %s" msgstr "" -#: content-quote.php:72 content.php:80 content-image.php:68 -#: content-single.php:52 content-intro.php:19 content-gallery.php:90 -#: content-aside.php:44 image.php:41 functions.php:505 functions.php:533 -#: content-status.php:45 content-page.php:21 content-link.php:44 -#: content-featured.php:45 -msgid "Edit" +#: author.php:49 content-single.php:60 +msgid "About %s" msgstr "" -#: showcase.php:72 -msgid "Featured Post" +#: category.php:19 +msgid "Category Archives: %s" msgstr "" -#: showcase.php:145 -msgid "Featuring: %s" +#: comments.php:17 +msgid "" +"This post is password protected. Enter the password to view any comments." msgstr "" -#: showcase.php:155 -msgid "Recent Posts" -msgstr "" +#: comments.php:33 +msgid "One thought on “%2$s”" +msgid_plural "%1$s thoughts on “%2$s”" +msgstr[0] "" +msgstr[1] "" -#: index.php:37 category.php:50 tag.php:50 author.php:74 search.php:42 -#: archive.php:57 -msgid "Nothing Found" +#: comments.php:40 comments.php:60 +msgid "Comment navigation" msgstr "" -#: index.php:41 category.php:54 tag.php:54 author.php:78 archive.php:61 -msgid "" -"Apologies, but no results were found for the requested archive. Perhaps " -"searching will help find a related post." +#: comments.php:41 comments.php:61 +msgid "← Older Comments" msgstr "" -#: content.php:16 -msgid "Featured" +#: comments.php:42 comments.php:62 +msgid "Newer Comments →" msgstr "" -#. #-#-#-#-# twentyeleven.pot (Twenty Eleven 1.3) #-#-#-#-# -#. Author URI of the plugin/theme -#: footer.php:27 -msgid "http://wordpress.org/" +#: comments.php:72 +msgid "Comments are closed." msgstr "" -#: footer.php:27 -msgid "Semantic Personal Publishing Platform" +#: content-aside.php:16 content-featured.php:14 content-gallery.php:16 +#: content-gallery.php:48 content-image.php:15 content-link.php:16 +#: content-quote.php:14 content-status.php:15 content.php:15 content.php:19 +#: inc/widgets.php:89 showcase.php:115 showcase.php:194 +msgid "Permalink to %s" msgstr "" -#: footer.php:27 -msgid "Proudly powered by %s" +#: content-aside.php:17 +msgid "Aside" msgstr "" -#: category.php:19 -msgid "Category Archives: %s" +#: content-aside.php:22 content-image.php:21 content-link.php:22 +#: content-quote.php:24 content-status.php:21 content.php:30 +msgid "Reply" msgstr "" -#: content-image.php:16 -msgid "Image" +#: content-aside.php:22 content-image.php:21 content-link.php:22 +#: content-quote.php:24 content-status.php:21 content.php:30 +msgctxt "comments number" +msgid "1" msgstr "" -#: content-image.php:34 -msgid "" -" by " -" %6$s" +#: content-aside.php:22 content-image.php:21 content-link.php:22 +#: content-quote.php:24 content-status.php:21 content.php:30 +msgctxt "comments number" +msgid "%" msgstr "" -#: content-image.php:39 functions.php:570 -msgid "View all posts by %s" +#: content-aside.php:33 content-gallery.php:32 content-image.php:27 +#: content-link.php:33 content-quote.php:35 content-status.php:34 +#: content.php:41 functions.php:327 +msgid "Continue reading →" msgstr "" -#: sidebar.php:19 -msgid "Archives" +#: content-aside.php:34 content-featured.php:23 content-gallery.php:54 +#: content-image.php:28 content-intro.php:18 content-link.php:34 +#: content-page.php:18 content-quote.php:36 content-single.php:24 +#: content-status.php:35 content.php:42 image.php:90 +msgid "Pages:" msgstr "" -#: sidebar.php:26 -msgid "Meta" +#: content-aside.php:42 content-gallery.php:87 content-image.php:64 +#: content-link.php:42 content-quote.php:69 content-status.php:43 +#: content.php:77 showcase.php:196 +msgid "Leave a reply" msgstr "" -#: content-single.php:35 -msgid "" -"This entry was posted in %1$s and tagged %2$s by %5$s. " -"Bookmark the permalink." +#: content-aside.php:42 content-gallery.php:87 content-image.php:64 +#: content-link.php:42 content-quote.php:69 content-status.php:43 +#: content.php:77 showcase.php:196 +msgid "1 Reply" msgstr "" -#: content-single.php:37 -msgid "" -"This entry was posted in %1$s by %5$s. Bookmark the permalink." +#: content-aside.php:42 content-gallery.php:87 content-image.php:64 +#: content-link.php:42 content-quote.php:69 content-status.php:43 +#: content.php:77 showcase.php:196 +msgid "% Replies" msgstr "" -#: content-single.php:39 -msgid "" -"This entry was posted by %5$s. Bookmark the permalink." +#: content-aside.php:44 content-featured.php:45 content-gallery.php:90 +#: content-image.php:68 content-intro.php:19 content-link.php:44 +#: content-page.php:21 content-quote.php:72 content-single.php:52 +#: content-status.php:45 content.php:80 functions.php:505 functions.php:533 +#: image.php:41 +msgid "Edit" msgstr "" -#: content-single.php:60 author.php:49 -msgid "About %s" +#. translators: used between list items, there is a space after the comma +#: content-featured.php:29 content-featured.php:38 content-gallery.php:62 +#: content-gallery.php:72 content-image.php:47 content-image.php:56 +#: content-quote.php:44 content-quote.php:54 content-single.php:30 +#: content-single.php:33 content.php:51 content.php:61 +msgid ", " msgstr "" -#: content-single.php:64 -msgid "View all posts by %s →" +#: content-featured.php:31 +msgid "" +"This entry was posted in %1$s and tagged %2$s. Bookmark the permalink." msgstr "" -#: tag.php:19 -msgid "Tag Archives: %s" +#: content-featured.php:33 +msgid "" +"This entry was posted in %1$s. Bookmark the permalink." msgstr "" #: content-gallery.php:17 @@ -207,74 +204,83 @@ msgid_plural "This gallery contains %2$s photos." msgstr[0] "" msgstr[1] "" -#: comments.php:17 -msgid "" -"This post is password protected. Enter the password to view any comments." +#: content-gallery.php:66 content-image.php:51 content-quote.php:48 +#: content.php:55 +msgid "Posted in %2$s" msgstr "" -#: comments.php:33 -msgid "One thought on “%2$s”" -msgid_plural "%1$s thoughts on “%2$s”" -msgstr[0] "" -msgstr[1] "" +#: content-gallery.php:78 content-image.php:59 content-quote.php:60 +#: content.php:67 +msgid "Tagged %2$s" +msgstr "" -#: comments.php:40 comments.php:60 -msgid "Comment navigation" +#: content-image.php:16 +msgid "Image" msgstr "" -#: comments.php:41 comments.php:61 -msgid "← Older Comments" +#: content-image.php:34 +msgid "" +" by " +" %6$s" msgstr "" -#: comments.php:42 comments.php:62 -msgid "Newer Comments →" +#: content-image.php:39 functions.php:570 +msgid "View all posts by %s" msgstr "" -#: comments.php:72 -msgid "Comments are closed." +#: content-link.php:17 +msgid "Link" msgstr "" -#: content-aside.php:17 -msgid "Aside" +#: content-quote.php:15 +msgid "Quote" msgstr "" -#: 404.php:17 -msgid "This is somewhat embarrassing, isn’t it?" +#: content-single.php:35 +msgid "" +"This entry was posted in %1$s and tagged %2$s by %5$s. " +"Bookmark the permalink." msgstr "" -#: 404.php:21 +#: content-single.php:37 msgid "" -"It seems we can’t find what you’re looking for. Perhaps " -"searching, or one of the links below, can help." +"This entry was posted in %1$s by %5$s. Bookmark the permalink." msgstr "" -#: 404.php:28 -msgid "Most Used Categories" +#: content-single.php:39 +msgid "" +"This entry was posted by %5$s. Bookmark the permalink." msgstr "" -#. translators: %1$s: smilie -#: 404.php:36 -msgid "Try looking in the monthly archives. %1$s" +#: content-single.php:64 +msgid "View all posts by %s →" msgstr "" -#: image.php:18 -msgid "Image navigation" +#: content-status.php:16 +msgid "Status" msgstr "" -#: image.php:19 -msgid "← Previous" +#: content.php:16 +msgid "Featured" msgstr "" -#: image.php:20 -msgid "Next →" +#. #-#-#-#-# twentyeleven.pot (Twenty Eleven 1.3) #-#-#-#-# +#. Author URI of the plugin/theme +#: footer.php:27 +msgid "http://wordpress.org/" msgstr "" -#: image.php:30 -msgid "" -"Published %2$s " -"at %4$s × %5$s " -"in %8$s" +#: footer.php:27 +msgid "Semantic Personal Publishing Platform" +msgstr "" + +#: footer.php:27 +msgid "Proudly powered by %s" msgstr "" #: functions.php:101 @@ -408,12 +414,24 @@ msgstr "" msgid "Skip to secondary content" msgstr "" -#: author.php:28 -msgid "Author Archives: %s" +#: image.php:18 +msgid "Image navigation" msgstr "" -#: content-status.php:16 -msgid "Status" +#: image.php:19 +msgid "← Previous" +msgstr "" + +#: image.php:20 +msgid "Next →" +msgstr "" + +#: image.php:30 +msgid "" +"Published %2$s " +"at %4$s × %5$s " +"in %8$s" msgstr "" #: inc/theme-options.php:61 @@ -566,46 +584,28 @@ msgid "" "different keywords." msgstr "" -#: archive.php:25 -msgid "Daily Archives: %s" -msgstr "" - -#: archive.php:27 -msgid "Monthly Archives: %s" -msgstr "" - -#: archive.php:27 -msgctxt "monthly archives date format" -msgid "F Y" -msgstr "" - -#: archive.php:29 -msgid "Yearly Archives: %s" +#: searchform.php:11 searchform.php:12 searchform.php:13 +msgid "Search" msgstr "" -#: archive.php:29 -msgctxt "yearly archives date format" -msgid "Y" +#: showcase.php:72 +msgid "Featured Post" msgstr "" -#: archive.php:31 -msgid "Blog Archives" +#: showcase.php:145 +msgid "Featuring: %s" msgstr "" -#: content-link.php:17 -msgid "Link" +#: showcase.php:155 +msgid "Recent Posts" msgstr "" -#: content-featured.php:31 -msgid "" -"This entry was posted in %1$s and tagged %2$s. Bookmark the permalink." +#: sidebar.php:19 +msgid "Archives" msgstr "" -#: content-featured.php:33 -msgid "" -"This entry was posted in %1$s. Bookmark the permalink." +#: sidebar.php:26 +msgid "Meta" msgstr "" #: single.php:19 @@ -616,8 +616,8 @@ msgstr "" msgid "Next →" msgstr "" -#: searchform.php:11 searchform.php:12 searchform.php:13 -msgid "Search" +#: tag.php:19 +msgid "Tag Archives: %s" msgstr "" #. Theme Name of the plugin/theme diff --git a/wp-content/themes/twentyten/languages/twentyten.pot b/wp-content/themes/twentyten/languages/twentyten.pot index 314cbab9..208848db 100644 --- a/wp-content/themes/twentyten/languages/twentyten.pot +++ b/wp-content/themes/twentyten/languages/twentyten.pot @@ -1,89 +1,65 @@ -# Copyright (C) 2010 Twenty Ten -# This file is distributed under the same license as the Twenty Ten package. +# Copyright (C) 2012 the WordPress team +# This file is distributed under the GNU General Public License. msgid "" msgstr "" "Project-Id-Version: Twenty Ten 1.3\n" -"Report-Msgid-Bugs-To: http://wordpress.org/tag/twentyten\n" -"POT-Creation-Date: 2011-12-10 19:27:25+00:00\n" +"Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyten\n" +"POT-Creation-Date: 2012-02-10 16:30:52+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2010-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2012-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" -#: loop-attachment.php:21 -msgid "Return to %s" -msgstr "" - -#. translators: %s - title of parent post -#: loop-attachment.php:23 -msgid "← %s" -msgstr "" - -#: loop-attachment.php:32 -msgid "By %2$s" -msgstr "" - -#: loop-attachment.php:36 functions.php:476 -msgid "View all posts by %s" +#: 404.php:16 loop.php:33 +msgid "Not Found" msgstr "" -#: loop-attachment.php:43 -msgid "Published %2$s" +#: 404.php:18 +msgid "" +"Apologies, but the page you requested could not be found. Perhaps searching " +"will help." msgstr "" -#: loop-attachment.php:53 -msgid "Full size is %s pixels" +#: archive.php:33 +msgid "Daily Archives: %s" msgstr "" -#: loop-attachment.php:56 -msgid "Link to full-size image" +#: archive.php:35 +msgid "Monthly Archives: %s" msgstr "" -#: loop-attachment.php:63 loop-attachment.php:111 loop.php:100 loop.php:123 -#: loop.php:165 loop-page.php:30 loop-single.php:56 -msgid "Edit" +#: archive.php:35 +msgctxt "monthly archives date format" +msgid "F Y" msgstr "" -#: loop-attachment.php:104 loop.php:115 loop.php:143 functions.php:248 -msgid "Continue reading →" +#: archive.php:37 +msgid "Yearly Archives: %s" msgstr "" -#: loop-attachment.php:105 loop.php:144 loop-page.php:29 loop-single.php:34 -msgid "Pages:" +#: archive.php:37 +msgctxt "yearly archives date format" +msgid "Y" msgstr "" -#. #-#-#-#-# twentyten.pot (Twenty Ten 1.3) #-#-#-#-# -#. Theme URI of the plugin/theme -#: footer.php:33 -msgid "http://wordpress.org/" +#: archive.php:39 +msgid "Blog Archives" msgstr "" -#: footer.php:33 -msgid "Semantic Personal Publishing Platform" +#: author.php:27 +msgid "Author Archives: %s" msgstr "" -#: footer.php:33 -msgid "Proudly powered by %s." +#: author.php:37 loop-single.php:43 +msgid "About %s" msgstr "" #: category.php:16 msgid "Category Archives: %s" msgstr "" -#: sidebar.php:27 -msgid "Archives" -msgstr "" - -#: sidebar.php:34 -msgid "Meta" -msgstr "" - -#: tag.php:16 -msgid "Tag Archives: %s" -msgstr "" - #: comments.php:18 msgid "" "This post is password protected. Enter the password to view any comments." @@ -107,80 +83,18 @@ msgstr "" msgid "Comments are closed." msgstr "" -#: 404.php:16 loop.php:33 -msgid "Not Found" -msgstr "" - -#: 404.php:18 -msgid "" -"Apologies, but the page you requested could not be found. Perhaps searching " -"will help." -msgstr "" - -#: loop.php:25 loop.php:178 -msgid "← Older posts" -msgstr "" - -#: loop.php:26 loop.php:179 -msgid "Newer posts →" -msgstr "" - -#: loop.php:35 -msgid "" -"Apologies, but no results were found for the requested archive. Perhaps " -"searching will help find a related post." -msgstr "" - -#: loop.php:60 loop.php:95 loop.php:96 -msgctxt "gallery category slug" -msgid "gallery" -msgstr "" - -#: loop.php:62 loop.php:83 loop.php:131 -msgid "Permalink to %s" -msgstr "" - -#: loop.php:82 -msgid "This gallery contains %2$s photo." -msgid_plural "This gallery contains %2$s photos." -msgstr[0] "" -msgstr[1] "" - -#: loop.php:93 -msgid "View Galleries" -msgstr "" - -#: loop.php:93 loop.php:96 -msgid "More Galleries" -msgstr "" - -#: loop.php:96 -msgid "View posts in the Gallery category" -msgstr "" - -#: loop.php:99 loop.php:122 loop.php:164 -msgid "Leave a comment" -msgstr "" - -#: loop.php:99 loop.php:122 loop.php:164 -msgid "1 Comment" -msgstr "" - -#: loop.php:99 loop.php:122 loop.php:164 -msgid "% Comments" -msgstr "" - -#: loop.php:106 -msgctxt "asides category slug" -msgid "asides" +#. #-#-#-#-# twentyten.pot (Twenty Ten 1.3) #-#-#-#-# +#. Theme URI of the plugin/theme +#: footer.php:33 +msgid "http://wordpress.org/" msgstr "" -#: loop.php:151 -msgid "Posted in %2$s" +#: footer.php:33 +msgid "Semantic Personal Publishing Platform" msgstr "" -#: loop.php:160 -msgid "Tagged %2$s" +#: footer.php:33 +msgid "Proudly powered by %s." msgstr "" #: functions.php:100 @@ -227,6 +141,10 @@ msgstr "" msgid "Sunset" msgstr "" +#: functions.php:248 loop-attachment.php:104 loop.php:115 loop.php:143 +msgid "Continue reading →" +msgstr "" + #: functions.php:330 msgid "%s says:" msgstr "" @@ -302,6 +220,10 @@ msgid "" "span> %3$s" msgstr "" +#: functions.php:476 loop-attachment.php:36 +msgid "View all posts by %s" +msgstr "" + #: functions.php:493 msgid "" "This entry was posted in %1$s and tagged %2$s. Bookmark the ← %s" msgstr "" -#: search.php:16 -msgid "Search Results for: %s" +#: loop-attachment.php:32 +msgid "By %2$s" msgstr "" -#: search.php:26 -msgid "Nothing Found" +#: loop-attachment.php:43 +msgid "Published %2$s" msgstr "" -#: search.php:28 -msgid "" -"Sorry, but nothing matched your search criteria. Please try again with some " -"different keywords." +#: loop-attachment.php:53 +msgid "Full size is %s pixels" +msgstr "" + +#: loop-attachment.php:56 +msgid "Link to full-size image" +msgstr "" + +#: loop-attachment.php:63 loop-attachment.php:111 loop-page.php:30 +#: loop-single.php:56 loop.php:100 loop.php:123 loop.php:165 +msgid "Edit" +msgstr "" + +#: loop-attachment.php:105 loop-page.php:29 loop-single.php:34 loop.php:144 +msgid "Pages:" msgstr "" #: loop-single.php:21 loop-single.php:61 @@ -364,30 +298,96 @@ msgstr "" msgid "View all posts by %s →" msgstr "" -#: archive.php:33 -msgid "Daily Archives: %s" +#: loop.php:25 loop.php:178 +msgid "← Older posts" msgstr "" -#: archive.php:35 -msgid "Monthly Archives: %s" +#: loop.php:26 loop.php:179 +msgid "Newer posts →" msgstr "" -#: archive.php:35 -msgctxt "monthly archives date format" -msgid "F Y" +#: loop.php:35 +msgid "" +"Apologies, but no results were found for the requested archive. Perhaps " +"searching will help find a related post." msgstr "" -#: archive.php:37 -msgid "Yearly Archives: %s" +#: loop.php:60 loop.php:95 loop.php:96 +msgctxt "gallery category slug" +msgid "gallery" msgstr "" -#: archive.php:37 -msgctxt "yearly archives date format" -msgid "Y" +#: loop.php:62 loop.php:83 loop.php:131 +msgid "Permalink to %s" msgstr "" -#: archive.php:39 -msgid "Blog Archives" +#: loop.php:82 +msgid "This gallery contains %2$s photo." +msgid_plural "This gallery contains %2$s photos." +msgstr[0] "" +msgstr[1] "" + +#: loop.php:93 +msgid "View Galleries" +msgstr "" + +#: loop.php:93 loop.php:96 +msgid "More Galleries" +msgstr "" + +#: loop.php:96 +msgid "View posts in the Gallery category" +msgstr "" + +#: loop.php:99 loop.php:122 loop.php:164 +msgid "Leave a comment" +msgstr "" + +#: loop.php:99 loop.php:122 loop.php:164 +msgid "1 Comment" +msgstr "" + +#: loop.php:99 loop.php:122 loop.php:164 +msgid "% Comments" +msgstr "" + +#: loop.php:106 +msgctxt "asides category slug" +msgid "asides" +msgstr "" + +#: loop.php:151 +msgid "Posted in %2$s" +msgstr "" + +#: loop.php:160 +msgid "Tagged %2$s" +msgstr "" + +#: search.php:16 +msgid "Search Results for: %s" +msgstr "" + +#: search.php:26 +msgid "Nothing Found" +msgstr "" + +#: search.php:28 +msgid "" +"Sorry, but nothing matched your search criteria. Please try again with some " +"different keywords." +msgstr "" + +#: sidebar.php:27 +msgid "Archives" +msgstr "" + +#: sidebar.php:34 +msgid "Meta" +msgstr "" + +#: tag.php:16 +msgid "Tag Archives: %s" msgstr "" #. Theme Name of the plugin/theme diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php index 3452ed2a..d43e848f 100644 --- a/wp-includes/formatting.php +++ b/wp-includes/formatting.php @@ -1350,9 +1350,17 @@ function antispambot($emailaddy, $mailto=0) { */ function _make_url_clickable_cb($matches) { $url = $matches[2]; - $suffix = ''; - /** Include parentheses in the URL only if paired **/ + if ( ')' == $matches[3] && strpos( $url, '(' ) ) { + // If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it, add the closing parenthesis to the URL. + // Then we can let the parenthesis balancer do its thing below. + $url .= $matches[3]; + $suffix = ''; + } else { + $suffix = $matches[3]; + } + + // Include parentheses in the URL only if paired while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) { $suffix = strrchr( $url, ')' ) . $suffix; $url = substr( $url, 0, strrpos( $url, ')' ) ); @@ -1418,23 +1426,117 @@ function _make_email_clickable_cb($matches) { * * @since 0.71 * - * @param string $ret Content to convert URIs. + * @param string $text Content to convert URIs. * @return string Content with converted URIs. */ -function make_clickable($ret) { - $ret = ' ' . $ret; - // in testing, using arrays here was found to be faster - $save = @ini_set('pcre.recursion_limit', 10000); - $retval = preg_replace_callback('#(?])(\()?([\w]+?://(?:[\w\\x80-\\xff\#%~/?@\[\]-]{1,2000}|[\'*(+.,;:!=&$](?![\b\)]|(\))?([\s]|$))|(?(1)\)(?![\s<.,;:]|$)|\)))+)#is', '_make_url_clickable_cb', $ret); - if (null !== $retval ) - $ret = $retval; - @ini_set('pcre.recursion_limit', $save); - $ret = preg_replace_callback('#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret); - $ret = preg_replace_callback('#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret); - // this one is not in an array because we need it to run last, for cleanup of accidental links within links - $ret = preg_replace("#(]+?>|>))]+?>([^>]+?)#i", "$1$3", $ret); - $ret = trim($ret); - return $ret; +function make_clickable( $text ) { + $r = ''; + $textarr = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // split out HTML tags + foreach ( $textarr as $piece ) { + if ( empty( $piece ) || ( $piece[0] == '<' && ! preg_match('|^<\s*[\w]{1,20}+://|', $piece) ) ) { + $r .= $piece; + continue; + } + + // Long strings might contain expensive edge cases ... + if ( 10000 < strlen( $piece ) ) { + // ... break it up + foreach ( _split_str_by_whitespace( $piece, 2100 ) as $chunk ) { // 2100: Extra room for scheme and leading and trailing paretheses + if ( 2101 < strlen( $chunk ) ) { + $r .= $chunk; // Too big, no whitespace: bail. + } else { + $r .= make_clickable( $chunk ); + } + } + } else { + $ret = " $piece "; // Pad with whitespace to simplify the regexes + + $url_clickable = '~ + ([\\s(<.,;:!?]) # 1: Leading whitespace, or punctuation + ( # 2: URL + [\\w]{1,20}+:// # Scheme and hier-part prefix + (?=\S{1,2000}\s) # Limit to URLs less than about 2000 characters long + [\\w\\x80-\\xff#%\\~/@\\[\\]*(+=&$-]*+ # Non-punctuation URL character + (?: # Unroll the Loop: Only allow puctuation URL character if followed by a non-punctuation URL character + [\'.,;:!?)] # Punctuation URL character + [\\w\\x80-\\xff#%\\~/@\\[\\]*(+=&$-]++ # Non-punctuation URL character + )* + ) + (\)?) # 3: Trailing closing parenthesis (for parethesis balancing post processing) + ~xS'; // The regex is a non-anchored pattern and does not have a single fixed starting character. + // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times. + + $ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret ); + + $ret = preg_replace_callback( '#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret ); + $ret = preg_replace_callback( '#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret ); + + $ret = substr( $ret, 1, -1 ); // Remove our whitespace padding. + $r .= $ret; + } + } + + // Cleanup of accidental links within links + $r = preg_replace( '#(]+?>|>))]+?>([^>]+?)#i', "$1$3", $r ); + return $r; +} + +/** + * Breaks a string into chunks by splitting at whitespace characters. + * The length of each returned chunk is as close to the specified length goal as possible, + * with the caveat that each chunk includes its trailing delimiter. + * Chunks longer than the goal are guaranteed to not have any inner whitespace. + * + * Joining the returned chunks with empty delimiters reconstructs the input string losslessly. + * + * Input string must have no null characters (or eventual transformations on output chunks must not care about null characters) + * + * + * _split_str_by_whitespace( "1234 67890 1234 67890a cd 1234 890 123456789 1234567890a 45678 1 3 5 7 90 ", 10 ) == + * array ( + * 0 => '1234 67890 ', // 11 characters: Perfect split + * 1 => '1234 ', // 5 characters: '1234 67890a' was too long + * 2 => '67890a cd ', // 10 characters: '67890a cd 1234' was too long + * 3 => '1234 890 ', // 11 characters: Perfect split + * 4 => '123456789 ', // 10 characters: '123456789 1234567890a' was too long + * 5 => '1234567890a ', // 12 characters: Too long, but no inner whitespace on which to split + * 6 => ' 45678 ', // 11 characters: Perfect split + * 7 => '1 3 5 7 9', // 9 characters: End of $string + * ); + * + * + * @since 3.4.0 + * @access private + * + * @param string $string The string to split + * @param int $goal The desired chunk length. + * @return array Numeric array of chunks. + */ +function _split_str_by_whitespace( $string, $goal ) { + $chunks = array(); + + $string_nullspace = strtr( $string, "\r\n\t\v\f ", "\000\000\000\000\000\000" ); + + while ( $goal < strlen( $string_nullspace ) ) { + $pos = strrpos( substr( $string_nullspace, 0, $goal + 1 ), "\000" ); + + if ( false === $pos ) { + $pos = strpos( $string_nullspace, "\000", $goal + 1 ); + if ( false === $pos ) { + break; + } + } + + $chunks[] = substr( $string, 0, $pos + 1 ); + $string = substr( $string, $pos + 1 ); + $string_nullspace = substr( $string_nullspace, $pos + 1 ); + } + + if ( $string ) { + $chunks[] = $string; + } + + return $chunks; } /** diff --git a/wp-includes/js/plupload/changelog.txt b/wp-includes/js/plupload/changelog.txt index bec5aeef..56947216 100644 --- a/wp-includes/js/plupload/changelog.txt +++ b/wp-includes/js/plupload/changelog.txt @@ -1,3 +1,37 @@ +Version 1.5.4 (2012-04-12) + Flash: Disable scripting if swf was loaded from another domain. +Version 1.5.3 (2012-04-05) + HTML5: Check if xhr object is initialized, before calling abort() on it. + HTML4: Postpone form removal until uploaders state changes, to avoid error on resuming stopped uploads. + BrowserPlus: Fix mechanical typo, that caused error during mime type check. + BrowserPlus: browserPlus.Uploader.Cancel() has two required parameters, dies with the error if not passed. + Flash: Improve runtime's behaviour during upload cancellation. + Flash: Survive the case when GPSVersionID contains unexpected value. + Flash: Fix random freeze in Chrome's bundled Flash Player. + Flash: Avoid the silent break when URLStream not yet open, but close is called on it. + Flash: Move Destroy handler out of Flash:Init handler, since it might be called not only after Flash:Init but also before it. + Flash: Avoid warning during build with mxmlc. + Try removeEventListener first in IE and only if it fails - detachEvent. + Fix plupload.getPos to return proper value in IE8+. + Do not initiate plupload.STARTED state, if file queue is empty. + Additional language packs: Estonian, Polish, Korean, French-Canadian, Greek, Persian/Farsi. +Version 1.5.2 (2012-01-06) + UI Widget: Do not show UI if no runtime can be initialized. + UI Widget: Timely update file size and total size if resize in action. + UI Widget: Constrain renaming feature to queued files only. + UI Widget: Disable Add button properly, if requested, rather then just hide. + HTML4/HTML5/BrowserPlus: Avoid adding mime type twice to dialog trigger. + HTML5: fix regression, when unresized images were failing on FF3.6. + HTML5: Constrain Gecko 2,5,6 workaround to multipart mode only. + HTML5/Flash: Take into account weird possibilities of ExifVersion being a string, rather then standard Undefined. + Flash: Simplify event dispatching in BitmapDataUnlimited class, in order to avoid freezing on resizing in FP11. + Add ability to disable file dialog trigger on request (uploader.disableBrowse(true/false)). + Support for immediate abort of upload process, be it chunked upload or regular one. + Abort all activity, before destroying uploader. + Revive temporary file removal logic in upload.php. + Fix potential vulnerability in dump.php and upload.php. + Additional MIME types: application/vnd.openxmlformats-officedocument.*, application/x-javascript, application/json, text/css,css, application/vnd.oasis.opendocument.formula-templat. + Additional language packs: Hungarian, Croatian, Serbian, Romanian. Version 1.5.1.1 (2011-09-27) HTML5: Fix mechanical typo, that successfully broke drag and drop, wherever could. Version 1.5.1 (2011-09-26) diff --git a/wp-includes/js/plupload/handlers.dev.js b/wp-includes/js/plupload/handlers.dev.js index d0f8708d..5dc56a3d 100644 --- a/wp-includes/js/plupload/handlers.dev.js +++ b/wp-includes/js/plupload/handlers.dev.js @@ -44,11 +44,13 @@ function fileUploading(up, file) { if ( max > hundredmb && file.size > hundredmb ) { setTimeout(function(){ - if ( file.status == 2 && file.loaded == 0 ) { // not uploading - wpFileError(file, pluploadL10n.big_upload_failed.replace('%1$s', '').replace('%2$s', '')); + var done; - if ( up.current && up.current.file.id == file.id && up.current.xhr.abort ) - up.current.xhr.abort(); + if ( file.status < 3 && file.loaded == 0 ) { // not uploading + wpFileError(file, pluploadL10n.big_upload_failed.replace('%1$s', '').replace('%2$s', '')); + up.stop(); // stops the whole queue + up.removeFile(file); + up.start(); // restart the queue } }, 10000); // wait for 10 sec. for the file to start uploading } diff --git a/wp-includes/js/plupload/plupload.flash.js b/wp-includes/js/plupload/plupload.flash.js index 8dc2f55d..aa87c6b8 100644 --- a/wp-includes/js/plupload/plupload.flash.js +++ b/wp-includes/js/plupload/plupload.flash.js @@ -1 +1 @@ -(function(f,b,d,e){var a={},g={};function c(){var h;try{h=navigator.plugins["Shockwave Flash"];h=h.description}catch(j){try{h=new ActiveXObject("ShockwaveFlash.ShockwaveFlash").GetVariable("$version")}catch(i){h="0.0"}}h=h.match(/\d+/g);return parseFloat(h[0]+"."+h[1])}d.flash={trigger:function(j,h,i){setTimeout(function(){var m=a[j],l,k;if(m){m.trigger("Flash:"+h,i)}},0)}};d.runtimes.Flash=d.addRuntime("flash",{getFeatures:function(){return{jpgresize:true,pngresize:true,maxWidth:8091,maxHeight:8091,chunks:true,progress:true,multipart:true,multi_selection:true}},init:function(m,o){var k,l,h=0,i=b.body;if(c()<10){o({success:false});return}g[m.id]=false;a[m.id]=m;k=b.getElementById(m.settings.browse_button);l=b.createElement("div");l.id=m.id+"_flash_container";d.extend(l.style,{position:"absolute",top:"0px",background:m.settings.shim_bgcolor||"transparent",zIndex:99999,width:"100%",height:"100%"});l.className="plupload flash";if(m.settings.container){i=b.getElementById(m.settings.container);if(d.getStyle(i,"position")==="static"){i.style.position="relative"}}i.appendChild(l);(function(){var p,q;p='';if(d.ua.ie){q=b.createElement("div");l.appendChild(q);q.outerHTML=p;q=null}else{l.innerHTML=p}}());function n(){return b.getElementById(m.id+"_flash")}function j(){if(h++>5000){o({success:false});return}if(!g[m.id]){setTimeout(j,1)}}j();k=l=null;m.bind("Flash:Init",function(){var q={},p;n().setFileFilters(m.settings.filters,m.settings.multi_selection);if(g[m.id]){return}g[m.id]=true;m.bind("UploadFile",function(r,t){var u=r.settings,s=m.settings.resize||{};n().uploadFile(q[t.id],u.url,{name:t.target_name||t.name,mime:d.mimeTypes[t.name.replace(/^.+\.([^.]+)/,"$1").toLowerCase()]||"application/octet-stream",chunk_size:u.chunk_size,width:s.width,height:s.height,quality:s.quality,multipart:u.multipart,multipart_params:u.multipart_params||{},file_data_name:u.file_data_name,format:/\.(jpg|jpeg)$/i.test(t.name)?"jpg":"png",headers:u.headers,urlstream_upload:u.urlstream_upload})});m.bind("Flash:UploadProcess",function(s,r){var t=s.getFile(q[r.id]);if(t.status!=d.FAILED){t.loaded=r.loaded;t.size=r.size;s.trigger("UploadProgress",t)}});m.bind("Flash:UploadChunkComplete",function(r,t){var u,s=r.getFile(q[t.id]);u={chunk:t.chunk,chunks:t.chunks,response:t.text};r.trigger("ChunkUploaded",s,u);if(s.status!=d.FAILED){n().uploadNextChunk()}if(t.chunk==t.chunks-1){s.status=d.DONE;r.trigger("FileUploaded",s,{response:t.text})}});m.bind("Flash:SelectFiles",function(r,u){var t,s,v=[],w;for(s=0;s';if(d.ua.ie){q=b.createElement("div");l.appendChild(q);q.outerHTML=p;q=null}else{l.innerHTML=p}}());function n(){return b.getElementById(m.id+"_flash")}function j(){if(h++>5000){o({success:false});return}if(g[m.id]===false){setTimeout(j,1)}}j();k=l=null;m.bind("Destroy",function(p){var q;d.removeAllEvents(b.body,p.id);delete g[p.id];delete a[p.id];q=b.getElementById(p.id+"_flash_container");if(q){i.removeChild(q)}});m.bind("Flash:Init",function(){var r={},q;try{n().setFileFilters(m.settings.filters,m.settings.multi_selection)}catch(p){o({success:false});return}if(g[m.id]){return}g[m.id]=true;m.bind("UploadFile",function(s,u){var v=s.settings,t=m.settings.resize||{};n().uploadFile(r[u.id],v.url,{name:u.target_name||u.name,mime:d.mimeTypes[u.name.replace(/^.+\.([^.]+)/,"$1").toLowerCase()]||"application/octet-stream",chunk_size:v.chunk_size,width:t.width,height:t.height,quality:t.quality,multipart:v.multipart,multipart_params:v.multipart_params||{},file_data_name:v.file_data_name,format:/\.(jpg|jpeg)$/i.test(u.name)?"jpg":"png",headers:v.headers,urlstream_upload:v.urlstream_upload})});m.bind("CancelUpload",function(){n().cancelUpload()});m.bind("Flash:UploadProcess",function(t,s){var u=t.getFile(r[s.id]);if(u.status!=d.FAILED){u.loaded=s.loaded;u.size=s.size;t.trigger("UploadProgress",u)}});m.bind("Flash:UploadChunkComplete",function(s,u){var v,t=s.getFile(r[u.id]);v={chunk:u.chunk,chunks:u.chunks,response:u.text};s.trigger("ChunkUploaded",t,v);if(t.status!==d.FAILED&&s.state!==d.STOPPED){n().uploadNextChunk()}if(u.chunk==u.chunks-1){t.status=d.DONE;s.trigger("FileUploaded",t,{response:u.text})}});m.bind("Flash:SelectFiles",function(s,v){var u,t,w=[],x;for(t=0;t

  • Does the user %2$s have permission to use the %1$s database?
  • On some systems the name of your database is prefixed with your username, so it would be like username_%1$s. Could that be the problem?
    • -

    If you don\'t know how to set up a database you should contact your host. If all else fails you may find help at the WordPress Support Forums.

    '/*/WP_I18N_DB_SELECT_DB*/, $db, $this->dbuser ), 'db_select_fail' ); +

    If you don\'t know how to set up a database you should contact your host. If all else fails you may find help at the WordPress Support Forums.

    '/*/WP_I18N_DB_SELECT_DB*/, htmlspecialchars( $db, ENT_QUOTES ), htmlspecialchars( $this->dbuser, ENT_QUOTES ) ), 'db_select_fail' ); return; } } @@ -1046,7 +1046,7 @@ class wpdb {
  • Are you sure that the database server is running?

    • If you're unsure what these terms mean you should probably contact your host. If you still need help you can always visit the WordPress Support Forums.

    -"/*/WP_I18N_DB_CONN_ERROR*/, $this->dbhost ), 'db_connect_fail' ); +"/*/WP_I18N_DB_CONN_ERROR*/, htmlspecialchars( $this->dbhost, ENT_QUOTES ) ), 'db_connect_fail' ); return; }