Commit 09fcbfad authored by lechuck's avatar lechuck Committed by lechuck

update wordpress 3.3.2

parent a7cfa472
......@@ -8,7 +8,7 @@
<body>
<h1 id="logo">
<a href="http://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" width="250" height="68" /></a>
<br /> Version 3.3.1
<br /> Version 3.3.2
</h1>
<p style="text-align: center">Semantic Personal Publishing Platform</p>
......
......@@ -34,7 +34,11 @@ include( './admin-header.php' );
</h2>
<div class="changelog point-releases">
<h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 1 ); ?></h3>
<h3><?php echo _n( 'Maintenance and Security Release', 'Maintenance and Security Releases', 2 ); ?></h3>
<p><?php printf( _n( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
'<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.', 12 ), '3.3.2', number_format_i18n( 12 ) ); ?>
<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_3.3.2' ); ?>
</p>
<p><?php printf( _n( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
'<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.', 15 ), '3.3.1', number_format_i18n( 15 ) ); ?>
<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_3.3.1' ); ?>
......
......@@ -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;
......
......@@ -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;
......
......@@ -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();
......
......@@ -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.');
......
......@@ -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;
?>
# 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 <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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&rsquo;t it?"
msgstr ""
#: content-quote.php:15
msgid "Quote"
#: 404.php:21
msgid ""
"It seems we can&rsquo;t find what you&rsquo;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 <span class=\"meta-nav\">&rarr;</span>"
#: 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 "<span class=\"%1$s\">Posted in</span> %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 "<span class=\"%1$s\">Tagged</span> %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 "<b>1</b> 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 "<b>%</b> 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 &ldquo;%2$s&rdquo;"
msgid_plural "%1$s thoughts on &ldquo;%2$s&rdquo;"
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 "&larr; Older Comments"
msgstr ""
#: content.php:16
msgid "Featured"
#: comments.php:42 comments.php:62
msgid "Newer Comments &rarr;"
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 ""
"<a href=\"%1$s\" rel=\"bookmark\"><time class=\"entry-date\" datetime=\"%2$s"
"\" pubdate>%3$s</time></a><span class=\"by-author\"> <span class=\"sep\"> by "
"</span> <span class=\"author vcard\"><a class=\"url fn n\" href=\"%4$s\" "
"title=\"%5$s\" rel=\"author\">%6$s</a></span></span>"
#: 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 <span class=\"meta-nav\">&rarr;</span>"
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 <a href=\"%6$s\">%5$s</a>. "
"Bookmark the <a href=\"%3$s\" title=\"Permalink to %4$s\" rel=\"bookmark"
"\">permalink</a>."
#: 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 "<b>1</b> Reply"
msgstr ""
#: content-single.php:37
msgid ""
"This entry was posted in %1$s by <a href=\"%6$s\">%5$s</a>. Bookmark the <a "
"href=\"%3$s\" title=\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
#: 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 "<b>%</b> Replies"
msgstr ""
#: content-single.php:39
msgid ""
"This entry was posted by <a href=\"%6$s\">%5$s</a>. Bookmark the <a href=\"%3"
"$s\" title=\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
#: 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 <span class=\"meta-nav\">&rarr;</span>"
#: content-featured.php:31
msgid ""
"This entry was posted in %1$s and tagged %2$s. Bookmark the <a href=\"%3$s\" "
"title=\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
msgstr ""
#: tag.php:19
msgid "Tag Archives: %s"
#: content-featured.php:33
msgid ""
"This entry was posted in %1$s. Bookmark the <a href=\"%3$s\" title="
"\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
msgstr ""
#: content-gallery.php:17
......@@ -207,74 +204,83 @@ msgid_plural "This gallery contains <a %1$s>%2$s photos</a>."
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 "<span class=\"%1$s\">Posted in</span> %2$s"
msgstr ""
#: comments.php:33
msgid "One thought on &ldquo;%2$s&rdquo;"
msgid_plural "%1$s thoughts on &ldquo;%2$s&rdquo;"
msgstr[0] ""
msgstr[1] ""
#: content-gallery.php:78 content-image.php:59 content-quote.php:60
#: content.php:67
msgid "<span class=\"%1$s\">Tagged</span> %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 "&larr; Older Comments"
#: content-image.php:34
msgid ""
"<a href=\"%1$s\" rel=\"bookmark\"><time class=\"entry-date\" datetime=\"%2$s"
"\" pubdate>%3$s</time></a><span class=\"by-author\"> <span class=\"sep\"> by "
"</span> <span class=\"author vcard\"><a class=\"url fn n\" href=\"%4$s\" "
"title=\"%5$s\" rel=\"author\">%6$s</a></span></span>"
msgstr ""
#: comments.php:42 comments.php:62
msgid "Newer Comments &rarr;"
#: 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&rsquo;t it?"
#: content-single.php:35
msgid ""
"This entry was posted in %1$s and tagged %2$s by <a href=\"%6$s\">%5$s</a>. "
"Bookmark the <a href=\"%3$s\" title=\"Permalink to %4$s\" rel=\"bookmark"
"\">permalink</a>."
msgstr ""
#: 404.php:21
#: content-single.php:37
msgid ""
"It seems we can&rsquo;t find what you&rsquo;re looking for. Perhaps "
"searching, or one of the links below, can help."
"This entry was posted in %1$s by <a href=\"%6$s\">%5$s</a>. Bookmark the <a "
"href=\"%3$s\" title=\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
msgstr ""
#: 404.php:28
msgid "Most Used Categories"
#: content-single.php:39
msgid ""
"This entry was posted by <a href=\"%6$s\">%5$s</a>. Bookmark the <a href=\"%3"
"$s\" title=\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
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 <span class=\"meta-nav\">&rarr;</span>"
msgstr ""
#: image.php:18
msgid "Image navigation"
#: content-status.php:16
msgid "Status"
msgstr ""
#: image.php:19
msgid "&larr; Previous"
#: content.php:16
msgid "Featured"
msgstr ""
#: image.php:20
msgid "Next &rarr;"
#. #-#-#-#-# twentyeleven.pot (Twenty Eleven 1.3) #-#-#-#-#
#. Author URI of the plugin/theme
#: footer.php:27
msgid "http://wordpress.org/"
msgstr ""
#: image.php:30
msgid ""
"<span class=\"meta-prep meta-prep-entry-date\">Published </span> <span class="
"\"entry-date\"><abbr class=\"published\" title=\"%1$s\">%2$s</abbr></span> "
"at <a href=\"%3$s\" title=\"Link to full-size image\">%4$s &times; %5$s</a> "
"in <a href=\"%6$s\" title=\"Return to %7$s\" rel=\"gallery\">%8$s</a>"
#: 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 "&larr; Previous"
msgstr ""
#: image.php:20
msgid "Next &rarr;"
msgstr ""
#: image.php:30
msgid ""
"<span class=\"meta-prep meta-prep-entry-date\">Published </span> <span class="
"\"entry-date\"><abbr class=\"published\" title=\"%1$s\">%2$s</abbr></span> "
"at <a href=\"%3$s\" title=\"Link to full-size image\">%4$s &times; %5$s</a> "
"in <a href=\"%6$s\" title=\"Return to %7$s\" rel=\"gallery\">%8$s</a>"
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