Revert r25824:25875 from the core.svn.wordpress.org repository.

These commits were accidentally re-synced commits from develop.svn.wordpress.org due to a race condition. Thankfully, the history of this repository matters fairly little. It also happened only for trunk.


git-svn-id: http://core.svn.wordpress.org/trunk@25876 1a063a9b-81f0-0310-95a4-ce76da25c4cd

wp-admin/about.php

@@ -52,23 +52,36 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 			<p><?php _e( 'You&#8217;ll still need to click &#8220;Update Now&#8221; once WordPress 3.8 is released, but we&#8217;ve never had more confidence in that beautiful blue button.' ); ?></p>
 		</div>
 		<?php
-			$can_auto_update = wp_http_supports( 'ssl' );
+		if ( current_user_can( 'update_core' ) ) {
+			$future_minor_update = (object) array(
+				'current'       => $wp_version . '.1.next.minor',
+				'version'       => $wp_version . '.1.next.minor',
+				'php_version'   => $required_php_version,
+				'mysql_version' => $required_mysql_version,
+			);
+			require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+			$updater = new WP_Automatic_Updater;
+			$can_auto_update = wp_http_supports( 'ssl' ) && $updater->should_update( 'core', $future_minor_update, ABSPATH );
+
 			if ( $can_auto_update ) {
-				require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+				echo '<p class="about-auto-update cool">' . __( 'This site <strong>is</strong> able to apply these updates automatically. Cool!' ). '</p>';
-				$upgrader = new WP_Automatic_Updater;
+
-				$future_minor_update = (object) array(
+			// If the updater is disabled entirely, don't show them anything.
-					'current'       => $wp_version . '.1.next.minor',
+			} elseif ( ! $updater->is_disabled() ) {
-					'version'       => $wp_version . '.1.next.minor',
+				echo '<p class="about-auto-update">';
-					'php_version'   => $required_php_version,
+				// If this is is filtered to false, they won't get emails, so don't claim we will.
-					'mysql_version' => $required_mysql_version,
+				// Assumption: If the user can update core, they can see what the admin email is.
-				);
+
-				$can_auto_update = $upgrader->should_update( 'core', $future_minor_update, ABSPATH );
+				/** This filter is documented in wp-admin/includes/class-wp-upgrader.php */
+				if ( apply_filters( 'send_core_update_notification_email', true, $future_minor_update ) ) {
+					printf( __( 'This site <strong>is not</strong> able to apply these updates automatically. But we&#8217;ll email %s when there is a new security release.' ), esc_html( get_site_option( 'admin_email' ) ) );
+				} else {
+					_e( 'This site <strong>is not</strong> able to apply these updates automatically.' );
+				}
+				echo '</p>';
 			}
-			if ( $can_auto_update ) : ?>
+		}
-				<p class="about-auto-update cool"><?php _e( 'This site <strong>is</strong> able to apply these updates automatically. Cool!' ); ?></p>
+		?>
-			<?php else : ?>
-				<p class="about-auto-update"><?php printf( __( 'This site <strong>is not</strong> able to apply these updates automatically. But we&#8217;ll email %s when there is a new security release.' ), esc_html( get_site_option( 'admin_email' ) ) ); ?></p>
-		<?php endif; ?>
 	</div>
 </div>
 

wp-admin/includes/class-wp-upgrader.php

@@ -1739,7 +1739,7 @@ class WP_Automatic_Updater {
 		// If we can't do an auto core update, we may still be able to email the user.
 		if ( ! $skin->request_filesystem_credentials( false, $context ) || $this->is_vcs_checkout( $context ) ) {
 			if ( 'core' == $type )
-				$this->notify_core_update( $item );
+				$this->send_core_update_notification_email( $item );
 			return false;
 		}
 
@@ -1770,7 +1770,7 @@ class WP_Automatic_Updater {
 
 		if ( ! $update ) {
 			if ( 'core' == $type )
-				$this->notify_core_update( $item );
+				$this->send_core_update_notification_email( $item );
 			return false;
 		}
 
@@ -1798,11 +1798,7 @@ class WP_Automatic_Updater {
 	 *
 	 * @param object $item The update offer.
 	 */
-	protected function notify_core_update( $item ) {
+	protected function send_core_update_notification_email( $item ) {
-		// See if we need to notify users of a core update.
-		if ( empty( $item->notify_email ) )
-			return false;
-
 		$notify   = true;
 		$notified = get_site_option( 'auto_core_update_notified' );
 
@@ -1810,6 +1806,28 @@ class WP_Automatic_Updater {
 		if ( $notified && $notified['email'] == get_site_option( 'admin_email' ) && $notified['version'] == $item->current )
 			return false;
 
+		// See if we need to notify users of a core update.
+		$notify = ! empty( $item->notify_email );
+
+		/**
+		 * Whether to notify the site administrator of a new core update.
+		 *
+		 * By default, administrators are notified when the update offer received from WordPress.org
+		 * sets a particular flag. This allows for discretion in if and when to notify.
+		 *
+		 * This filter only fires once per release -- if the same email address was already
+		 * notified of the same new version, we won't repeatedly email the administrator.
+		 *
+		 * This filter is also used on about.php to check if a plugin has disabled these notifications.
+		 *
+		 * @since 3.7.0
+		 *
+		 * @param bool $notify Whether the site administrator is notified.
+		 * @param object $item The update offer.
+		 */
+		if ( ! apply_filters( 'send_core_update_notification_email', $notify, $item ) )
+			return false;
+
 		$this->send_email( 'manual', $item );
 		return true;
 	}
@@ -2119,19 +2137,17 @@ class WP_Automatic_Updater {
 			$next_user_core_update = $core_update;
 		$newer_version_available = ( 'upgrade' == $next_user_core_update->response && version_compare( $next_user_core_update->version, $core_update, '>' ) );
 
-		$newer_version_available = true;
-		$next_user_core_update->version = $next_user_core_update->current = '3.8.1';
 		/**
 		 * Filter whether to send an email following an automatic background core update.
 		 *
 		 * @since 3.7.0
 		 *
 		 * @param bool   $send        Whether to send the email. Default true.
-		 * @param string $type        The type of email to send. Can be one of 'success', 'fail', 'manual', 'critical'.
+		 * @param string $type        The type of email to send. Can be one of 'success', 'fail', 'critical'.
 		 * @param object $core_update The update offer that was attempted.
 		 * @param mixed  $result      The result for the core update. Can be WP_Error.
 		 */
-		if ( ! apply_filters( 'auto_core_update_send_email', true, $type, $core_update, $result ) )
+		if ( 'manual' !== $type && ! apply_filters( 'auto_core_update_send_email', true, $type, $core_update, $result ) )
 			return;
 
 		switch ( $type ) {

wp-admin/includes/update-core.php

@@ -561,6 +561,7 @@ $_old_files = array(
 // 3.7
 'wp-admin/js/cat.js',
 'wp-admin/js/cat.min.js',
+'wp-includes/js/tinymce/plugins/wpeditimage/js/editimage.min.js',
 );
 
 /**
@@ -894,7 +895,8 @@ function update_core($from, $to) {
 	do_action( '_core_updated_successfully', $wp_version );
 
 	// Clear the option that blocks auto updates after failures, now that we've been successful.
-	delete_site_option( 'auto_core_update_failed' );
+	if ( function_exists( 'delete_site_option' ) )
+		delete_site_option( 'auto_core_update_failed' );
 
 	return $wp_version;
 }

wp-admin/js/about.js

@@ -1,66 +1,80 @@
 (function($){
-    var password = 'Gosh, WordPress is grand.',
+	var password = 'Gosh, WordPress is grand.',
-        $input = $('#pass'),
+		$input = $('#pass'),
-        shouldAnimate = true,
+		shouldAnimate = true,
-        indicatorString = $('#pass-strength-result').text();
+		timesForAnimation = [280, 300, 305, 310, 315, 325, 330, 345, 360, 370, 380, 400, 450, 500, 600],
+		resultsCache = {},
+		indicatorString = $('#pass-strength-result').text();
 
-    function updateResult(){
+	function updateResult(){
-        var strength = wp.passwordStrength.meter($input.val(), [], $input.val());
+		var strength;
 
-        $('#pass-strength-result').removeClass('short bad good strong');
+		if ( typeof( resultsCache[ $input.val() ]) === 'undefined') {
-        switch ( strength ) {
+			strength = wp.passwordStrength.meter($input.val(), [], $input.val());
-            case 2:
+			resultsCache[ $input.val() ] = strength;
-                $('#pass-strength-result').addClass('bad').html( pwsL10n['bad'] );
+		} else {
-                break;
+			strength = resultsCache[ $input.val() ];
-            case 3:
+		}
-                $('#pass-strength-result').addClass('good').html( pwsL10n['good'] );
-                break;
-            case 4:
-                $('#pass-strength-result').addClass('strong').html( pwsL10n['strong'] );
-                break;
-            default:
-                $('#pass-strength-result').addClass('short').html( pwsL10n['short'] );
-        }
-    }
-    function resetMeter(){
-        $input.val('');
-        $('#pass-strength-result').text(indicatorString);
-        $('#pass-strength-result').removeClass('short bad good strong');
-    }
 
-    function animate(){
+		$('#pass-strength-result').removeClass('short bad good strong');
-        if (shouldAnimate === false)
+		switch ( strength ) {
-            return;
+			case 2:
-        if ($input.val().length < password.length){
+				$('#pass-strength-result').addClass('bad').html( pwsL10n['bad'] );
-            $input.val( password.substr(0, $input.val().length + 1) );
+				break;
-            updateResult();
+			case 3:
-        } else {
+				$('#pass-strength-result').addClass('good').html( pwsL10n['good'] );
-            resetMeter();
+				break;
-        }
+			case 4:
-        // Look like real typing by changing the speed new letters are added each time
+				$('#pass-strength-result').addClass('strong').html( pwsL10n['strong'] );
-        setTimeout(animate, 220 + Math.floor(Math.random() * ( 800 - 220)) );
+				break;
-    }
+			default:
-    // 
+				$('#pass-strength-result').addClass('short').html( pwsL10n['short'] );
-    function begin(){
+		}
-        // we async load zxcvbn, so we need to make sure it's loaded before starting 
+	}
-        if (typeof(zxcvbn) !== 'undefined')
+	function resetMeter(){
-            animate();
+		$input.val('');
-        else
+		$('#pass-strength-result').text(indicatorString);
-            setTimeout(begin,800);
+		$('#pass-strength-result').removeClass('short bad good strong');
-    }
+	}
 
-    // Turn off the animation on focus
+	function animate(){
-    $input.on('focus', function(){
+		if (shouldAnimate === false)
-        shouldAnimate = false;
+			return;
-        resetMeter();
+		if ($input.val().length < password.length){
-    });
+			$input.val( password.substr(0, $input.val().length + 1) );
+			updateResult();
 
-    // Act like a normal password strength meter 
+			// Look like real typing by changing the speed new letters are added each time
-    $input.on('keyup', function(){
+			setTimeout( animate, ( timesForAnimation[ Math.floor( Math.random() * timesForAnimation.length ) ] ) );
-        updateResult();
+		} else {
-    });
+			resetMeter();
 
-    // Start the animation
+			// When we reset, let's wait a bit longer than normal to start again
-    begin();
+			setTimeout(animate, 700);
+		}
+
+	}
+
+	function begin(){
+		// we async load zxcvbn, so we need to make sure it's loaded before starting
+		if (typeof(zxcvbn) !== 'undefined')
+			animate();
+		else
+			setTimeout(begin,800);
+	}
+
+	// Turn off the animation on focus
+	$input.on('focus', function(){
+		shouldAnimate = false;
+		resetMeter();
+	});
+
+	// Act like a normal password strength meter
+	$input.on('keyup', function(){
+		updateResult();
+	});
+
+	// Start the animation
+	begin();
 
 })(jQuery);

wp-admin/js/about.min.js

@@ -1 +1 @@
-!function(a){function b(){var b=wp.passwordStrength.meter(g.val(),[],g.val());switch(a("#pass-strength-result").removeClass("short bad good strong"),b){case 2:a("#pass-strength-result").addClass("bad").html(pwsL10n.bad);break;case 3:a("#pass-strength-result").addClass("good").html(pwsL10n.good);break;case 4:a("#pass-strength-result").addClass("strong").html(pwsL10n.strong);break;default:a("#pass-strength-result").addClass("short").html(pwsL10n["short"])}}function c(){g.val(""),a("#pass-strength-result").text(i),a("#pass-strength-result").removeClass("short bad good strong")}function d(){h!==!1&&(g.val().length<f.length?(g.val(f.substr(0,g.val().length+1)),b()):c(),setTimeout(d,220+Math.floor(580*Math.random())))}function e(){"undefined"!=typeof zxcvbn?d():setTimeout(e,800)}var f="Gosh, WordPress is grand.",g=a("#pass"),h=!0,i=a("#pass-strength-result").text();g.on("focus",function(){h=!1,c()}),g.on("keyup",function(){b()}),e()}(jQuery);
+!function(a){function b(){var b;switch("undefined"==typeof j[g.val()]?(b=wp.passwordStrength.meter(g.val(),[],g.val()),j[g.val()]=b):b=j[g.val()],a("#pass-strength-result").removeClass("short bad good strong"),b){case 2:a("#pass-strength-result").addClass("bad").html(pwsL10n.bad);break;case 3:a("#pass-strength-result").addClass("good").html(pwsL10n.good);break;case 4:a("#pass-strength-result").addClass("strong").html(pwsL10n.strong);break;default:a("#pass-strength-result").addClass("short").html(pwsL10n["short"])}}function c(){g.val(""),a("#pass-strength-result").text(k),a("#pass-strength-result").removeClass("short bad good strong")}function d(){h!==!1&&(g.val().length<f.length?(g.val(f.substr(0,g.val().length+1)),b(),setTimeout(d,i[Math.floor(Math.random()*i.length)])):(c(),setTimeout(d,700)))}function e(){"undefined"!=typeof zxcvbn?d():setTimeout(e,800)}var f="Gosh, WordPress is grand.",g=a("#pass"),h=!0,i=[280,300,305,310,315,325,330,345,360,370,380,400,450,500,600],j={},k=a("#pass-strength-result").text();g.on("focus",function(){h=!1,c()}),g.on("keyup",function(){b()}),e()}(jQuery);

wp-content/themes/twentyeleven/languages/twentyeleven.pot

@@ -2,9 +2,9 @@
 # This file is distributed under the GNU General Public License v2 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: Twenty Eleven 1.6\n"
+"Project-Id-Version: Twenty Eleven 1.7\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyeleven\n"
-"POT-Creation-Date: 2013-08-01 18:14:10+00:00\n"
+"POT-Creation-Date: 2013-10-24 19:42:42+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,22 +57,22 @@ msgstr ""
 msgid "Blog Archives"
 msgstr ""
 
-#: archive.php:57 author.php:74 category.php:50 index.php:37 search.php:42
+#: archive.php:57 author.php:86 category.php:59 index.php:37 search.php:44
-#: tag.php:50
+#: tag.php:60
 msgid "Nothing Found"
 msgstr ""
 
-#: archive.php:61 author.php:78 category.php:54 index.php:41 tag.php:54
+#: archive.php:61 author.php:90 category.php:63 index.php:41 tag.php:64
 msgid ""
 "Apologies, but no results were found for the requested archive. Perhaps "
 "searching will help find a related post."
 msgstr ""
 
-#: author.php:28
+#: author.php:29
 msgid "Author Archives: %s"
 msgstr ""
 
-#: author.php:49 content-single.php:60
+#: author.php:60 content-single.php:63
 msgid "About %s"
 msgstr ""
 
@@ -85,91 +85,91 @@ msgid ""
 "This post is password protected. Enter the password to view any comments."
 msgstr ""
 
-#: comments.php:33
+#: comments.php:34
 msgid "One thought on “%2$s”"
 msgid_plural "%1$s thoughts on “%2$s”"
 msgstr[0] ""
 msgstr[1] ""
 
-#: comments.php:40 comments.php:60
+#: comments.php:41 comments.php:62
 msgid "Comment navigation"
 msgstr ""
 
-#: comments.php:41 comments.php:61
+#: comments.php:42 comments.php:63
 msgid "← Older Comments"
 msgstr ""
 
-#: comments.php:42 comments.php:62
+#: comments.php:43 comments.php:64
 msgid "Newer Comments →"
 msgstr ""
 
-#: comments.php:71
+#: comments.php:74
 msgid "Comments are closed."
 msgstr ""
 
-#: content-aside.php:17
+#: content-aside.php:19
 msgid "Aside"
 msgstr ""
 
-#: content-aside.php:22 content-image.php:21 content-link.php:22
+#: content-aside.php:24 content-image.php:23 content-link.php:24
-#: content-quote.php:24 content-status.php:21 content.php:30
+#: content-quote.php:24 content-status.php:24 content.php:30
 msgid "Reply"
 msgstr ""
 
-#: content-aside.php:22 content-image.php:21 content-link.php:22
+#: content-aside.php:24 content-image.php:23 content-link.php:24
-#: content-quote.php:24 content-status.php:21 content.php:30
+#: content-quote.php:24 content-status.php:24 content.php:30
 msgctxt "comments number"
 msgid "1"
 msgstr ""
 
-#: content-aside.php:22 content-image.php:21 content-link.php:22
+#: content-aside.php:24 content-image.php:23 content-link.php:24
-#: content-quote.php:24 content-status.php:21 content.php:30
+#: content-quote.php:24 content-status.php:24 content.php:30
 msgctxt "comments number"
 msgid "%"
 msgstr ""
 
-#: content-aside.php:33 content-gallery.php:32 content-image.php:27
+#: content-aside.php:35 content-gallery.php:34 content-image.php:29
-#: content-link.php:33 content-quote.php:35 content-status.php:34
+#: content-link.php:35 content-quote.php:35 content-status.php:48
-#: content.php:41 functions.php:345
+#: content.php:41 functions.php:375
 msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
-#: content-aside.php:34 content-featured.php:23 content-gallery.php:50
+#: content-aside.php:36 content-featured.php:23 content-gallery.php:52
-#: content-image.php:28 content-intro.php:18 content-link.php:34
+#: content-image.php:30 content-intro.php:18 content-link.php:36
 #: content-page.php:18 content-quote.php:36 content-single.php:24
-#: content-status.php:35 content.php:42 image.php:90
+#: content-status.php:49 content.php:42 image.php:97
 msgid "Pages:"
 msgstr ""
 
-#: content-aside.php:42 content-gallery.php:83 content-image.php:64
+#: content-aside.php:44 content-gallery.php:85 content-image.php:66
-#: content-link.php:42 content-quote.php:69 content-status.php:43
+#: content-link.php:44 content-quote.php:69 content-status.php:57
-#: content.php:79 showcase.php:201
+#: content.php:79 showcase.php:202
 msgid "Leave a reply"
 msgstr ""
 
-#: content-aside.php:42 content-gallery.php:83 content-image.php:64
+#: content-aside.php:44 content-gallery.php:85 content-image.php:66
-#: content-link.php:42 content-quote.php:69 content-status.php:43
+#: content-link.php:44 content-quote.php:69 content-status.php:57
-#: content.php:79 showcase.php:201
+#: content.php:79 showcase.php:202
 msgid "<b>1</b> Reply"
 msgstr ""
 
-#: content-aside.php:42 content-gallery.php:83 content-image.php:64
+#: content-aside.php:44 content-gallery.php:85 content-image.php:66
-#: content-link.php:42 content-quote.php:69 content-status.php:43
+#: content-link.php:44 content-quote.php:69 content-status.php:57
-#: content.php:79 showcase.php:201
+#: content.php:79 showcase.php:202
 msgid "<b>%</b> Replies"
 msgstr ""
 
-#: content-aside.php:44 content-featured.php:45 content-gallery.php:86
+#: content-aside.php:46 content-featured.php:45 content-gallery.php:88
-#: content-image.php:68 content-intro.php:19 content-link.php:44
+#: content-image.php:70 content-intro.php:19 content-link.php:46
 #: content-page.php:21 content-quote.php:72 content-single.php:52
-#: content-status.php:45 content.php:82 functions.php:543 functions.php:571
+#: content-status.php:59 content.php:82 functions.php:606 functions.php:634
 #: image.php:41
 msgid "Edit"
 msgstr ""
 
 #. translators: used between list items, there is a space after the comma
-#: content-featured.php:29 content-featured.php:38 content-gallery.php:58
+#: content-featured.php:29 content-featured.php:38 content-gallery.php:60
-#: content-gallery.php:68 content-image.php:47 content-image.php:56
+#: content-gallery.php:70 content-image.php:49 content-image.php:58
 #: content-quote.php:44 content-quote.php:54 content-single.php:30
 #: content-single.php:33 content.php:51 content.php:63
 msgid ", "
@@ -187,35 +187,35 @@ msgid ""
 "\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
 msgstr ""
 
-#: content-gallery.php:17
+#: content-gallery.php:19
 msgid "Gallery"
 msgstr ""
 
-#: content-gallery.php:43
+#: content-gallery.php:45
 msgid "This gallery contains <a %1$s>%2$s photo</a>."
 msgid_plural "This gallery contains <a %1$s>%2$s photos</a>."
 msgstr[0] ""
 msgstr[1] ""
 
-#: content-gallery.php:44 showcase.php:120
+#: content-gallery.php:46 showcase.php:121
 msgid "Permalink to %s"
 msgstr ""
 
-#: content-gallery.php:62 content-image.php:51 content-quote.php:48
+#: content-gallery.php:64 content-image.php:53 content-quote.php:48
 #: content.php:55
 msgid "<span class=\"%1$s\">Posted in</span> %2$s"
 msgstr ""
 
-#: content-gallery.php:74 content-image.php:59 content-quote.php:60
+#: content-gallery.php:76 content-image.php:61 content-quote.php:60
 #: content.php:69
 msgid "<span class=\"%1$s\">Tagged</span> %2$s"
 msgstr ""
 
-#: content-image.php:16
+#: content-image.php:18
 msgid "Image"
 msgstr ""
 
-#: content-image.php:34
+#: content-image.php:36
 msgid ""
 "<a href=\"%1$s\" rel=\"bookmark\"><time class=\"entry-date\" datetime=\"%2$s"
 "\">%3$s</time></a><span class=\"by-author\"> <span class=\"sep\"> by </span> "
@@ -223,11 +223,11 @@ msgid ""
 "\" rel=\"author\">%6$s</a></span></span>"
 msgstr ""
 
-#: content-image.php:39 functions.php:608
+#: content-image.php:41 functions.php:672
 msgid "View all posts by %s"
 msgstr ""
 
-#: content-link.php:17
+#: content-link.php:19
 msgid "Link"
 msgstr ""
 
@@ -254,11 +254,11 @@ msgid ""
 "\"%3$s\" title=\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
 msgstr ""
 
-#: content-single.php:64
+#: content-single.php:67
 msgid "View all posts by %s <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
-#: content-status.php:16
+#: content-status.php:19
 msgid "Status"
 msgstr ""
 
@@ -266,17 +266,17 @@ msgstr ""
 msgid "Featured"
 msgstr ""
 
-#. #-#-#-#-#  twentyeleven.pot (Twenty Eleven 1.6)  #-#-#-#-#
+#. #-#-#-#-#  twentyeleven.pot (Twenty Eleven 1.7)  #-#-#-#-#
 #. Author URI of the plugin/theme
-#: footer.php:27
+#: footer.php:28
 msgid "http://wordpress.org/"
 msgstr ""
 
-#: footer.php:27
+#: footer.php:28
 msgid "Semantic Personal Publishing Platform"
 msgstr ""
 
-#: footer.php:27
+#: footer.php:28
 msgid "Proudly powered by %s"
 msgstr ""
 
@@ -285,108 +285,108 @@ msgid "Primary Menu"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:164
+#: functions.php:184
 msgid "Wheel"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:170
+#: functions.php:190
 msgid "Shore"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:176
+#: functions.php:196
 msgid "Trolley"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:182
+#: functions.php:202
 msgid "Pine Cone"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:188
+#: functions.php:208
 msgid "Chessboard"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:194
+#: functions.php:214
 msgid "Lanterns"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:200
+#: functions.php:220
 msgid "Willow"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:206
+#: functions.php:226
 msgid "Hanoi Plant"
 msgstr ""
 
-#: functions.php:394
+#: functions.php:443
 msgid "Main Sidebar"
 msgstr ""
 
-#: functions.php:403
+#: functions.php:452
 msgid "Showcase Sidebar"
 msgstr ""
 
-#: functions.php:405
+#: functions.php:454
 msgid "The sidebar for the optional Showcase Template"
 msgstr ""
 
-#: functions.php:413
+#: functions.php:462
 msgid "Footer Area One"
 msgstr ""
 
-#: functions.php:415 functions.php:425 functions.php:435
+#: functions.php:464 functions.php:474 functions.php:484
 msgid "An optional widget area for your site footer"
 msgstr ""
 
-#: functions.php:423
+#: functions.php:472
 msgid "Footer Area Two"
 msgstr ""
 
-#: functions.php:433
+#: functions.php:482
 msgid "Footer Area Three"
 msgstr ""
 
-#: functions.php:453 single.php:18
+#: functions.php:506 single.php:18
 msgid "Post navigation"
 msgstr ""
 
-#: functions.php:454
+#: functions.php:507
 msgid "<span class=\"meta-nav\">&larr;</span> Older posts"
 msgstr ""
 
-#: functions.php:455
+#: functions.php:508
 msgid "Newer posts <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
-#: functions.php:543
+#: functions.php:606
 msgid "Pingback:"
 msgstr ""
 
 #. translators: 1: comment author, 2: date and time
-#: functions.php:560
+#: functions.php:623
 msgid "%1$s on %2$s <span class=\"says\">said:</span>"
 msgstr ""
 
 #. translators: 1: date, 2: time
-#: functions.php:566
+#: functions.php:629
 msgid "%1$s at %2$s"
 msgstr ""
 
-#: functions.php:575
+#: functions.php:638
 msgid "Your comment is awaiting moderation."
 msgstr ""
 
-#: functions.php:584
+#: functions.php:647
 msgid "Reply <span>&darr;</span>"
 msgstr ""
 
-#: functions.php:602
+#: functions.php:666
 msgid ""
 "<span class=\"sep\">Posted on </span><a href=\"%1$s\" title=\"%2$s\" rel="
 "\"bookmark\"><time class=\"entry-date\" datetime=\"%3$s\">%4$s</time></"
@@ -395,19 +395,19 @@ msgid ""
 "\"author\">%7$s</a></span></span>"
 msgstr ""
 
-#: header.php:45
+#: header.php:43
 msgid "Page %s"
 msgstr ""
 
-#: header.php:129
+#: header.php:133
 msgid "Main menu"
 msgstr ""
 
-#: header.php:131
+#: header.php:135
 msgid "Skip to primary content"
 msgstr ""
 
-#: header.php:132
+#: header.php:136
 msgid "Skip to secondary content"
 msgstr ""
 
@@ -431,23 +431,23 @@ msgid ""
 "in <a href=\"%6$s\" title=\"Return to %7$s\" rel=\"gallery\">%8$s</a>"
 msgstr ""
 
-#: inc/theme-options.php:55 inc/theme-options.php:474
+#: inc/theme-options.php:56 inc/theme-options.php:530
 msgid "Color Scheme"
 msgstr ""
 
-#: inc/theme-options.php:61 inc/theme-options.php:491
+#: inc/theme-options.php:62 inc/theme-options.php:547
 msgid "Link Color"
 msgstr ""
 
-#: inc/theme-options.php:62
+#: inc/theme-options.php:63
 msgid "Default Layout"
 msgstr ""
 
-#: inc/theme-options.php:94 inc/theme-options.php:95
+#: inc/theme-options.php:95 inc/theme-options.php:96
 msgid "Theme Options"
 msgstr ""
 
-#: inc/theme-options.php:110
+#: inc/theme-options.php:111
 msgid ""
 "Some themes provide customization options that are grouped together on a "
 "Theme Options screen. If you change themes, options may change or disappear, "
@@ -455,14 +455,14 @@ msgid ""
 "following Theme Options:"
 msgstr ""
 
-#: inc/theme-options.php:112
+#: inc/theme-options.php:113
 msgid ""
 "<strong>Color Scheme</strong>: You can choose a color palette of \"Light"
 "\" (light background with dark text) or \"Dark\" (dark background with light "
 "text) for your site."
 msgstr ""
 
-#: inc/theme-options.php:113
+#: inc/theme-options.php:114
 msgid ""
 "<strong>Link Color</strong>: You can choose the color used for text links on "
 "your site. You can enter the HTML color or hex code, or you can choose "
@@ -470,104 +470,104 @@ msgid ""
 "wheel."
 msgstr ""
 
-#: inc/theme-options.php:114
+#: inc/theme-options.php:115
 msgid ""
 "<strong>Default Layout</strong>: You can choose if you want your site&#8217;"
 "s default layout to have a sidebar on the left, the right, or not at all."
 msgstr ""
 
-#: inc/theme-options.php:116
+#: inc/theme-options.php:117
 msgid ""
 "Remember to click \"Save Changes\" to save any changes you have made to the "
 "theme options."
 msgstr ""
 
-#: inc/theme-options.php:118
+#: inc/theme-options.php:119
 msgid "For more information:"
 msgstr ""
 
-#: inc/theme-options.php:119
+#: inc/theme-options.php:120
 msgid ""
 "<a href=\"http://codex.wordpress.org/Appearance_Theme_Options_Screen\" "
 "target=\"_blank\">Documentation on Theme Options</a>"
 msgstr ""
 
-#: inc/theme-options.php:120
+#: inc/theme-options.php:121
 msgid ""
 "<a href=\"http://wordpress.org/support/\" target=\"_blank\">Support Forums</"
 "a>"
 msgstr ""
 
-#: inc/theme-options.php:127
+#: inc/theme-options.php:128
 msgid "Overview"
 msgstr ""
 
-#: inc/theme-options.php:149
+#: inc/theme-options.php:150
 msgid "Light"
 msgstr ""
 
-#: inc/theme-options.php:155
+#: inc/theme-options.php:156
 msgid "Dark"
 msgstr ""
 
-#: inc/theme-options.php:173
+#: inc/theme-options.php:181
 msgid "Content on left"
 msgstr ""
 
-#: inc/theme-options.php:178
+#: inc/theme-options.php:186
 msgid "Content on right"
 msgstr ""
 
-#: inc/theme-options.php:183
+#: inc/theme-options.php:191
 msgid "One-column, no sidebar"
 msgstr ""
 
-#: inc/theme-options.php:273
+#: inc/theme-options.php:298
 msgid "Select a Color"
 msgstr ""
 
-#: inc/theme-options.php:276
+#: inc/theme-options.php:301
 msgid "Default color: %s"
 msgstr ""
 
-#: inc/theme-options.php:312
+#: inc/theme-options.php:337
 msgid "%s Theme Options"
 msgstr ""
 
-#: inc/theme-options.php:498
+#: inc/theme-options.php:554
 msgid "Layout"
 msgstr ""
 
-#: inc/widgets.php:19
+#: inc/widgets.php:23
 msgid ""
 "Use this widget to list your recent Aside, Status, Quote, and Link posts"
 msgstr ""
 
-#: inc/widgets.php:20
+#: inc/widgets.php:24
 msgid "Twenty Eleven Ephemera"
 msgstr ""
 
-#: inc/widgets.php:52
+#: inc/widgets.php:59
 msgid "Ephemera"
 msgstr ""
 
-#: inc/widgets.php:91 inc/widgets.php:100
+#: inc/widgets.php:98 inc/widgets.php:107
 msgid "0 <span class=\"reply\">comments &rarr;</span>"
 msgstr ""
 
-#: inc/widgets.php:91 inc/widgets.php:100
+#: inc/widgets.php:98 inc/widgets.php:107
 msgid "1 <span class=\"reply\">comment &rarr;</span>"
 msgstr ""
 
-#: inc/widgets.php:91 inc/widgets.php:100
+#: inc/widgets.php:98 inc/widgets.php:107
 msgid "% <span class=\"reply\">comments &rarr;</span>"
 msgstr ""
 
-#: inc/widgets.php:150
+#: inc/widgets.php:170
 msgid "Title:"
 msgstr ""
 
-#: inc/widgets.php:153
+#: inc/widgets.php:173
 msgid "Number of posts to show:"
 msgstr ""
 
@@ -575,7 +575,7 @@ msgstr ""
 msgid "Search Results for: %s"
 msgstr ""
 
-#: search.php:46
+#: search.php:48
 msgid ""
 "Sorry, but nothing matched your search criteria. Please try again with some "
 "different keywords."
@@ -585,15 +585,15 @@ msgstr ""
 msgid "Search"
 msgstr ""
 
-#: showcase.php:77
+#: showcase.php:78
 msgid "Featured Post"
 msgstr ""
 
-#: showcase.php:150
+#: showcase.php:151
 msgid "Featuring: %s"
 msgstr ""
 
-#: showcase.php:160
+#: showcase.php:161
 msgid "Recent Posts"
 msgstr ""
 

wp-content/themes/twentyeleven/style.css

@@ -4,7 +4,7 @@ Theme URI: http://wordpress.org/themes/twentyeleven
 Author: the WordPress team
 Author URI: http://wordpress.org/
 Description: The 2011 theme for WordPress is sophisticated, lightweight, and adaptable. Make it yours with a custom menu, header image, and background -- then go further with available theme options for light or dark color scheme, custom link colors, and three layout choices. Twenty Eleven comes equipped with a Showcase page template that transforms your front page into a showcase to show off your best content, widget support galore (sidebar, three footer areas, and a Showcase page widget area), and a custom "Ephemera" widget to display your Aside, Link, Quote, or Status posts. Included are styles for print and for the admin editor, support for featured images (as custom header images on posts and pages and as large images on featured "sticky" posts), and special styles for six different post formats.
-Version: 1.6
+Version: 1.7
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: dark, light, white, black, gray, one-column, two-columns, left-sidebar, right-sidebar, fixed-width, flexible-width, custom-background, custom-colors, custom-header, custom-menu, editor-style, featured-image-header, featured-images, flexible-header, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready

wp-content/themes/twentyten/languages/twentyten.pot

@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Twenty Ten 1.6\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyten\n"
-"POT-Creation-Date: 2013-08-01 18:14:06+00:00\n"
+"POT-Creation-Date: 2013-10-24 19:42:39+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -22,37 +22,37 @@ msgid ""
 "will help."
 msgstr ""
 
-#: archive.php:33
+#: archive.php:34
 msgid "Daily Archives: <span>%s</span>"
 msgstr ""
 
-#: archive.php:35
+#: archive.php:36
 msgid "Monthly Archives: <span>%s</span>"
 msgstr ""
 
-#: archive.php:35
+#: archive.php:36
 msgctxt "monthly archives date format"
 msgid "F Y"
 msgstr ""
 
-#: archive.php:37
+#: archive.php:38
 msgid "Yearly Archives: <span>%s</span>"
 msgstr ""
 
-#: archive.php:37
+#: archive.php:38
 msgctxt "yearly archives date format"
 msgid "Y"
 msgstr ""
 
-#: archive.php:39
+#: archive.php:40
 msgid "Blog Archives"
 msgstr ""
 
-#: author.php:27
+#: author.php:28
 msgid "Author Archives: %s"
 msgstr ""
 
-#: author.php:37 loop-single.php:43
+#: author.php:47 loop-single.php:46
 msgid "About %s"
 msgstr ""
 
@@ -65,168 +65,168 @@ msgid ""
 "This post is password protected. Enter the password to view any comments."
 msgstr ""
 
-#: comments.php:35
+#: comments.php:36
 msgid "One Response to %2$s"
 msgid_plural "%1$s Responses to %2$s"
 msgstr[0] ""
 msgstr[1] ""
 
-#: comments.php:41 comments.php:60
+#: comments.php:42 comments.php:62
 msgid "<span class=\"meta-nav\">&larr;</span> Older Comments"
 msgstr ""
 
-#: comments.php:42 comments.php:61
+#: comments.php:43 comments.php:63
 msgid "Newer Comments <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
-#: comments.php:70
+#: comments.php:73
 msgid "Comments are closed."
 msgstr ""
 
 #. #-#-#-#-#  twentyten.pot (Twenty Ten 1.6)  #-#-#-#-#
 #. Author URI of the plugin/theme
-#: footer.php:33
+#: footer.php:40
 msgid "http://wordpress.org/"
 msgstr ""
 
-#: footer.php:33
+#: footer.php:40
 msgid "Semantic Personal Publishing Platform"
 msgstr ""
 
-#: footer.php:33
+#: footer.php:40
 msgid "Proudly powered by %s."
 msgstr ""
 
-#: functions.php:93
+#: functions.php:95
 msgid "Primary Navigation"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:145
+#: functions.php:165
 msgid "Berries"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:151
+#: functions.php:171
 msgid "Cherry Blossoms"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:157
+#: functions.php:177
 msgid "Concave"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:163
+#: functions.php:183
 msgid "Fern"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:169
+#: functions.php:189
 msgid "Forest Floor"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:175
+#: functions.php:195
 msgid "Inkwell"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:181
+#: functions.php:201
 msgid "Path"
 msgstr ""
 
 #. translators: header image description
-#: functions.php:187
+#: functions.php:207
 msgid "Sunset"
 msgstr ""
 
-#: functions.php:255 loop-attachment.php:104 loop.php:114 loop.php:142
+#: functions.php:280 loop-attachment.php:118 loop.php:116 loop.php:144
 msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
-#: functions.php:338
+#: functions.php:373
 msgid "%s <span class=\"says\">says:</span>"
 msgstr ""
 
-#: functions.php:341
+#: functions.php:376
 msgid "Your comment is awaiting moderation."
 msgstr ""
 
 #. translators: 1: date, 2: time
-#: functions.php:348
+#: functions.php:383
 msgid "%1$s at %2$s"
 msgstr ""
 
-#: functions.php:348 functions.php:365
+#: functions.php:383 functions.php:400
 msgid "(Edit)"
 msgstr ""
 
-#: functions.php:365
+#: functions.php:400
 msgid "Pingback:"
 msgstr ""
 
-#: functions.php:384
+#: functions.php:420
 msgid "Primary Widget Area"
 msgstr ""
 
-#: functions.php:386
+#: functions.php:422
 msgid "Add widgets here to appear in your sidebar."
 msgstr ""
 
-#: functions.php:395
+#: functions.php:431
 msgid "Secondary Widget Area"
 msgstr ""
 
-#: functions.php:397
+#: functions.php:433
 msgid ""
 "An optional secondary widget area, displays below the primary widget area in "
 "your sidebar."
 msgstr ""
 
-#: functions.php:406
+#: functions.php:442
 msgid "First Footer Widget Area"
 msgstr ""
 
-#: functions.php:408 functions.php:419 functions.php:430 functions.php:441
+#: functions.php:444 functions.php:455 functions.php:466 functions.php:477
 msgid "An optional widget area for your site footer."
 msgstr ""
 
-#: functions.php:417
+#: functions.php:453
 msgid "Second Footer Widget Area"
 msgstr ""
 
-#: functions.php:428
+#: functions.php:464
 msgid "Third Footer Widget Area"
 msgstr ""
 
-#: functions.php:439
+#: functions.php:475
 msgid "Fourth Footer Widget Area"
 msgstr ""
 
-#: functions.php:475
+#: functions.php:511
 msgid ""
 "<span class=\"%1$s\">Posted on</span> %2$s <span class=\"meta-sep\">by</"
 "span> %3$s"
 msgstr ""
 
-#: functions.php:484 loop-attachment.php:36
+#: functions.php:520 loop-attachment.php:36
 msgid "View all posts by %s"
 msgstr ""
 
-#: functions.php:501
+#: functions.php:537
 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 ""
 
-#: functions.php:503
+#: functions.php:539
 msgid ""
 "This entry was posted in %1$s. Bookmark the <a href=\"%3$s\" title="
 "\"Permalink to %4$s\" rel=\"bookmark\">permalink</a>."
 msgstr ""
 
-#: functions.php:505
+#: functions.php:541
 msgid ""
 "Bookmark the <a href=\"%3$s\" title=\"Permalink to %4$s\" rel=\"bookmark"
 "\">permalink</a>."
@@ -236,7 +236,7 @@ msgstr ""
 msgid "Page %s"
 msgstr ""
 
-#: header.php:101
+#: header.php:105
 msgid "Skip to content"
 msgstr ""
 
@@ -265,34 +265,34 @@ msgstr ""
 msgid "Link to full-size image"
 msgstr ""
 
-#: loop-attachment.php:63 loop-attachment.php:111 loop-page.php:30
+#: loop-attachment.php:63 loop-attachment.php:125 loop-page.php:30
-#: loop-single.php:56 loop.php:99 loop.php:122 loop.php:164
+#: loop-single.php:59 loop.php:101 loop.php:124 loop.php:166
 msgid "Edit"
 msgstr ""
 
-#: loop-attachment.php:105 loop-page.php:29 loop-single.php:34 loop.php:143
+#: loop-attachment.php:119 loop-page.php:29 loop-single.php:34 loop.php:145
 msgid "Pages:"
 msgstr ""
 
-#: loop-single.php:21 loop-single.php:61
+#: loop-single.php:21 loop-single.php:64
 msgctxt "Previous post link"
 msgid "&larr;"
 msgstr ""
 
-#: loop-single.php:22 loop-single.php:62
+#: loop-single.php:22 loop-single.php:65
 msgctxt "Next post link"
 msgid "&rarr;"
 msgstr ""
 
-#: loop-single.php:47
+#: loop-single.php:50
 msgid "View all posts by %s <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
-#: loop.php:25 loop.php:177
+#: loop.php:25 loop.php:179
 msgid "<span class=\"meta-nav\">&larr;</span> Older posts"
 msgstr ""
 
-#: loop.php:26 loop.php:178
+#: loop.php:26 loop.php:180
 msgid "Newer posts <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
@@ -302,55 +302,55 @@ msgid ""
 "searching will help find a related post."
 msgstr ""
 
-#: loop.php:60 loop.php:94
+#: loop.php:62 loop.php:96
 msgctxt "gallery category slug"
 msgid "gallery"
 msgstr ""
 
-#: loop.php:81
+#: loop.php:83
 msgid "This gallery contains <a %1$s>%2$s photo</a>."
 msgid_plural "This gallery contains <a %1$s>%2$s photos</a>."
 msgstr[0] ""
 msgstr[1] ""
 
-#: loop.php:82
+#: loop.php:84
 msgid "Permalink to %s"
 msgstr ""
 
-#: loop.php:92
+#: loop.php:94
 msgid "View Galleries"
 msgstr ""
 
-#: loop.php:92 loop.php:95
+#: loop.php:94 loop.php:97
 msgid "More Galleries"
 msgstr ""
 
-#: loop.php:95
+#: loop.php:97
 msgid "View posts in the Gallery category"
 msgstr ""
 
-#: loop.php:98 loop.php:121 loop.php:163
+#: loop.php:100 loop.php:123 loop.php:165
 msgid "Leave a comment"
 msgstr ""
 
-#: loop.php:98 loop.php:121 loop.php:163
+#: loop.php:100 loop.php:123 loop.php:165
 msgid "1 Comment"
 msgstr ""
 
-#: loop.php:98 loop.php:121 loop.php:163
+#: loop.php:100 loop.php:123 loop.php:165
 msgid "% Comments"
 msgstr ""
 
-#: loop.php:105
+#: loop.php:107
 msgctxt "asides category slug"
 msgid "asides"
 msgstr ""
 
-#: loop.php:150
+#: loop.php:152
 msgid "<span class=\"%1$s\">Posted in</span> %2$s"
 msgstr ""
 
-#: loop.php:159
+#: loop.php:161
 msgid "<span class=\"%1$s\">Tagged</span> %2$s"
 msgstr ""
 
@@ -358,21 +358,21 @@ msgstr ""
 msgid "Search Results for: %s"
 msgstr ""
 
-#: search.php:26
+#: search.php:27
 msgid "Nothing Found"
 msgstr ""
 
-#: search.php:28
+#: search.php:29
 msgid ""
 "Sorry, but nothing matched your search criteria. Please try again with some "
 "different keywords."
 msgstr ""
 
-#: sidebar.php:27
+#: sidebar.php:28
 msgid "Archives"
 msgstr ""
 
-#: sidebar.php:34
+#: sidebar.php:35
 msgid "Meta"
 msgstr ""
 

wp-content/themes/twentythirteen/404.php

@@ -13,7 +13,7 @@ get_header(); ?>
 		<div id="content" class="site-content" role="main">
 
 			<header class="page-header">
-				<h1 class="page-title"><?php _e( 'Not Found', 'twentythirteen' ); ?></h1>
+				<h1 class="page-title"><?php _e( 'Not found', 'twentythirteen' ); ?></h1>
 			</header>
 
 			<div class="page-wrapper">

wp-content/themes/twentythirteen/functions.php

@@ -121,15 +121,13 @@ add_action( 'after_setup_theme', 'twentythirteen_setup' );
 function twentythirteen_fonts_url() {
 	$fonts_url = '';
 
-	/*
+	/* Translators: If there are characters in your language that are not
-	 * Translators: If there are characters in your language that are not
 	 * supported by Source Sans Pro, translate this to 'off'. Do not translate
 	 * into your own language.
 	 */
 	$source_sans_pro = _x( 'on', 'Source Sans Pro font: on or off', 'twentythirteen' );
 
-	/*
+	/* Translators: If there are characters in your language that are not
-	 * Translators: If there are characters in your language that are not
 	 * supported by Bitter, translate this to 'off'. Do not translate into your
 	 * own language.
 	 */

wp-content/themes/twentythirteen/languages/twentythirteen.pot

@@ -2,9 +2,9 @@
 # This file is distributed under the GNU General Public License v2 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: Twenty Thirteen 1.0\n"
+"Project-Id-Version: Twenty Thirteen 1.1\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/tags/twentythirteen\n"
-"POT-Creation-Date: 2013-08-01 18:14:17+00:00\n"
+"POT-Creation-Date: 2013-10-24 20:32:06+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -12,8 +12,8 @@ msgstr ""
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 
-#: 404.php:16 content-none.php:12
+#: 404.php:16
-msgid "Nothing Found"
+msgid "Not found"
 msgstr ""
 
 #: 404.php:21
@@ -50,15 +50,15 @@ msgstr ""
 msgid "Archives"
 msgstr ""
 
-#: author-bio.php:16
+#: author-bio.php:26
 msgid "About %s"
 msgstr ""
 
-#: author-bio.php:20
+#: author-bio.php:30
 msgid "View all posts by %s <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
-#: author.php:30
+#: author.php:31
 msgid "All posts by %s"
 msgstr ""
 
@@ -91,39 +91,43 @@ msgstr ""
 
 #: content-aside.php:13 content-audio.php:24 content-gallery.php:24
 #: content-image.php:23 content-link.php:24 content-quote.php:13
-#: content-status.php:13 content-video.php:23 content.php:39
+#: content-status.php:13 content-video.php:23 content.php:41
 msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
 #: content-aside.php:14 content-audio.php:25 content-chat.php:24
 #: content-gallery.php:25 content-image.php:24 content-link.php:25
 #: content-quote.php:14 content-status.php:14 content-video.php:24
-#: content.php:40 image.php:70 page.php:35
+#: content.php:42 image.php:70 page.php:35
 msgid "Pages:"
 msgstr ""
 
 #: content-aside.php:20 content-aside.php:28 content-audio.php:31
 #: content-chat.php:29 content-gallery.php:39 content-image.php:35
 #: content-link.php:19 content-quote.php:25 content-status.php:19
-#: content-video.php:35 content.php:29 image.php:44 page.php:39
+#: content-video.php:35 content.php:31 image.php:44 page.php:39
 msgid "Edit"
 msgstr ""
 
 #: content-gallery.php:36 content-image.php:32 content-quote.php:22
-#: content-video.php:32 content.php:47
+#: content-video.php:32 content.php:49
 msgid "Leave a comment"
 msgstr ""
 
 #: content-gallery.php:36 content-image.php:32 content-quote.php:22
-#: content-video.php:32 content.php:47
+#: content-video.php:32 content.php:49
 msgid "One comment so far"
 msgstr ""
 
 #: content-gallery.php:36 content-image.php:32 content-quote.php:22
-#: content-video.php:32 content.php:47
+#: content-video.php:32 content.php:49
 msgid "View all % comments"
 msgstr ""
 
+#: content-none.php:12
+msgid "Nothing Found"
+msgstr ""
+
 #: content-none.php:18
 msgid ""
 "Ready to publish your first post? <a href=\"%1$s\">Get started here</a>."
@@ -141,28 +145,28 @@ msgid ""
 "searching can help."
 msgstr ""
 
-#. #-#-#-#-#  twentythirteen.pot (Twenty Thirteen 1.0)  #-#-#-#-#
+#. #-#-#-#-#  twentythirteen.pot (Twenty Thirteen 1.1)  #-#-#-#-#
 #. Author URI of the plugin/theme
-#: footer.php:20
+#: footer.php:19
 msgid "http://wordpress.org/"
 msgstr ""
 
-#: footer.php:20
+#: footer.php:19
 msgid "Semantic Personal Publishing Platform"
 msgstr ""
 
-#: footer.php:20
+#: footer.php:19
 msgid "Proudly powered by %s"
 msgstr ""
 
-#: functions.php:93
+#: functions.php:97
 msgid "Navigation Menu"
 msgstr ""
 
 #. Translators: If there are characters in your language that are not
 #. 	 * supported by Source Sans Pro, translate this to 'off'. Do not translate
 #. 	 * into your own language.
-#: functions.php:124
+#: functions.php:128
 msgctxt "Source Sans Pro font: on or off"
 msgid "on"
 msgstr ""
@@ -170,76 +174,76 @@ msgstr ""
 #. Translators: If there are characters in your language that are not
 #. 	 * supported by Bitter, translate this to 'off'. Do not translate into your
 #. 	 * own language.
-#: functions.php:130
+#: functions.php:134
 msgctxt "Bitter font: on or off"
 msgid "on"
 msgstr ""
 
-#: functions.php:212
+#: functions.php:220
 msgid "Page %s"
 msgstr ""
 
-#: functions.php:227
+#: functions.php:235
 msgid "Main Widget Area"
 msgstr ""
 
-#: functions.php:229
+#: functions.php:237
 msgid "Appears in the footer section of the site."
 msgstr ""
 
-#: functions.php:237
+#: functions.php:245
 msgid "Secondary Widget Area"
 msgstr ""
 
-#: functions.php:239
+#: functions.php:247
 msgid "Appears on posts and pages in the sidebar."
 msgstr ""
 
-#: functions.php:264
+#: functions.php:272
 msgid "Posts navigation"
 msgstr ""
 
-#: functions.php:268
+#: functions.php:276
 msgid "<span class=\"meta-nav\">&larr;</span> Older posts"
 msgstr ""
 
-#: functions.php:272
+#: functions.php:280
 msgid "Newer posts <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
-#: functions.php:300
+#: functions.php:308
 msgid "Post navigation"
 msgstr ""
 
-#: functions.php:303
+#: functions.php:311
 msgctxt "Previous post link"
 msgid "<span class=\"meta-nav\">&larr;</span> %title"
 msgstr ""
 
-#: functions.php:304
+#: functions.php:312
 msgctxt "Next post link"
 msgid "%title <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
-#: functions.php:324
+#: functions.php:332
 msgid "Sticky"
 msgstr ""
 
 #. Translators: used between list items, there is a space after the comma.
-#: functions.php:330 functions.php:336
+#: functions.php:338 functions.php:344
 msgid ", "
 msgstr ""
 
-#: functions.php:345
+#: functions.php:353
 msgid "View all posts by %s"
 msgstr ""
 
-#: functions.php:365
+#: functions.php:373
 msgctxt "1: post format name. 2: date"
 msgid "%1$s on %2$s"
 msgstr ""
 
-#: functions.php:371
+#: functions.php:379
 msgid "Permalink to %s"
 msgstr ""
 
@@ -274,23 +278,23 @@ msgstr ""
 msgid "Next <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
-#: inc/back-compat.php:38 inc/back-compat.php:50 inc/back-compat.php:65
+#: inc/back-compat.php:41 inc/back-compat.php:53 inc/back-compat.php:68
 msgid ""
 "Twenty Thirteen requires at least WordPress version 3.6. You are running "
 "version %s. Please upgrade and try again."
 msgstr ""
 
-#: inc/custom-header.php:48
+#: inc/custom-header.php:51
 msgctxt "header image description"
 msgid "Circle"
 msgstr ""
 
-#: inc/custom-header.php:53
+#: inc/custom-header.php:56
 msgctxt "header image description"
 msgid "Diamond"
 msgstr ""
 
-#: inc/custom-header.php:58
+#: inc/custom-header.php:61
 msgctxt "header image description"
 msgid "Star"
 msgstr ""

wp-content/themes/twentythirteen/style.css

@@ -4,7 +4,7 @@ Theme URI: http://wordpress.org/themes/twentythirteen
 Author: the WordPress team
 Author URI: http://wordpress.org/
 Description: The 2013 theme for WordPress takes us back to the blog, featuring a full range of post formats, each displayed beautifully in their own unique way. Design details abound, starting with a vibrant color scheme and matching header images, beautiful typography and icons, and a flexible layout that looks great on any device, big or small.
-Version: 1.0
+Version: 1.1
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: black, brown, orange, tan, white, yellow, light, one-column, two-columns, right-sidebar, flexible-width, custom-header, custom-menu, editor-style, featured-images, microformats, post-formats, rtl-language-support, sticky-post, translation-ready

wp-content/themes/twentytwelve/functions.php

@@ -95,15 +95,13 @@ require( get_template_directory() . '/inc/custom-header.php' );
 function twentytwelve_get_font_url() {
 	$font_url = '';
 
-	/*
+	/* translators: If there are characters in your language that are not supported
-	 * translators: If there are characters in your language that are not supported
 	 * by Open Sans, translate this to 'off'. Do not translate into your own language.
 	 */
 	if ( 'off' !== _x( 'on', 'Open Sans font: on or off', 'twentytwelve' ) ) {
 		$subsets = 'latin,latin-ext';
 
-		/*
+		/* translators: To add an additional Open Sans character subset specific to your language,
-		 * translators: To add an additional Open Sans character subset specific to your language,
 		 * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
 		 */
 		$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)', 'twentytwelve' );

wp-content/themes/twentytwelve/languages/twentytwelve.pot

@@ -2,9 +2,9 @@
 # This file is distributed under the GNU General Public License v2 or later.
 msgid ""
 msgstr ""
-"Project-Id-Version: Twenty Twelve 1.2\n"
+"Project-Id-Version: Twenty Twelve 1.3\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/tags/twentytwelve\n"
-"POT-Creation-Date: 2013-08-01 18:14:14+00:00\n"
+"POT-Creation-Date: 2013-10-24 20:32:05+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,7 +52,7 @@ msgstr ""
 msgid "Author Archives: %s"
 msgstr ""
 
-#: author.php:53 content.php:53
+#: author.php:63 content.php:59
 msgid "About %s"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgid "Comments are closed."
 msgstr ""
 
 #: content-aside.php:15 content-image.php:13 content-link.php:14
-#: content-quote.php:13 content-status.php:21 content.php:39
+#: content-quote.php:13 content-status.php:31 content.php:41
 msgid "Continue reading <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
@@ -93,23 +93,23 @@ msgid "Permalink to %s"
 msgstr ""
 
 #: content-aside.php:23 content-image.php:23 content-link.php:21
-#: content-quote.php:20 content-status.php:27 content.php:28
+#: content-quote.php:20 content-status.php:37 content.php:30
 msgid "Leave a reply"
 msgstr ""
 
 #: content-aside.php:23 content-image.php:23 content-link.php:21
-#: content-quote.php:20 content-status.php:27 content.php:28
+#: content-quote.php:20 content-status.php:37 content.php:30
 msgid "1 Reply"
 msgstr ""
 
 #: content-aside.php:23 content-image.php:23 content-link.php:21
-#: content-quote.php:20 content-status.php:27 content.php:28
+#: content-quote.php:20 content-status.php:37 content.php:30
 msgid "% Replies"
 msgstr ""
 
 #: content-aside.php:26 content-image.php:26 content-link.php:24
-#: content-page.php:24 content-quote.php:23 content-status.php:30
+#: content-page.php:24 content-quote.php:23 content-status.php:40
-#: content.php:46 functions.php:341 image.php:37
+#: content.php:48 functions.php:349 image.php:37
 msgid "Edit"
 msgstr ""
 
@@ -127,29 +127,29 @@ msgid ""
 "related post."
 msgstr ""
 
-#: content-page.php:21 content.php:40 image.php:92
+#: content-page.php:21 content.php:42 image.php:102
 msgid "Pages:"
 msgstr ""
 
-#: content.php:14
+#: content.php:16
 msgid "Featured post"
 msgstr ""
 
-#: content.php:57
+#: content.php:63
 msgid "View all posts by %s <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
-#. #-#-#-#-#  twentytwelve.pot (Twenty Twelve 1.2)  #-#-#-#-#
+#. #-#-#-#-#  twentytwelve.pot (Twenty Twelve 1.3)  #-#-#-#-#
 #. Author URI of the plugin/theme
-#: footer.php:17
+#: footer.php:16
 msgid "http://wordpress.org/"
 msgstr ""
 
-#: footer.php:17
+#: footer.php:16
 msgid "Semantic Personal Publishing Platform"
 msgstr ""
 
-#: footer.php:17
+#: footer.php:16
 msgid "Proudly powered by %s"
 msgstr ""
 
@@ -158,111 +158,111 @@ msgid "Primary Menu"
 msgstr ""
 
 #. translators: If there are characters in your language that are not supported
-#. 	 by Open Sans, translate this to 'off'. Do not translate into your own
+#. 	 * by Open Sans, translate this to 'off'. Do not translate into your own
 #. language.
-#: functions.php:100
+#: functions.php:101
 msgctxt "Open Sans font: on or off"
 msgid "on"
 msgstr ""
 
 #. translators: To add an additional Open Sans character subset specific to
-#. your language, translate
+#. your language,
-#. 		 this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your
+#. 		 * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate
-#. own language.
+#. into your own language.
-#: functions.php:105
+#: functions.php:107
 msgctxt "Open Sans font: add new subset (greek, cyrillic, vietnamese)"
 msgid "no-subset"
 msgstr ""
 
-#: functions.php:213
+#: functions.php:215
 msgid "Page %s"
 msgstr ""
 
-#: functions.php:238
+#: functions.php:244
 msgid "Main Sidebar"
 msgstr ""
 
-#: functions.php:240
+#: functions.php:246
 msgid ""
 "Appears on posts and pages except the optional Front Page template, which "
 "has its own widgets"
 msgstr ""
 
-#: functions.php:248
+#: functions.php:254
 msgid "First Front Page Widget Area"
 msgstr ""
 
-#: functions.php:250 functions.php:260
+#: functions.php:256 functions.php:266
 msgid ""
 "Appears when using the optional Front Page template with a page set as "
 "Static Front Page"
 msgstr ""
 
-#: functions.php:258
+#: functions.php:264
 msgid "Second Front Page Widget Area"
 msgstr ""
 
-#: functions.php:282 single.php:20
+#: functions.php:288 single.php:20
 msgid "Post navigation"
 msgstr ""
 
-#: functions.php:283
+#: functions.php:289
 msgid "<span class=\"meta-nav\">&larr;</span> Older posts"
 msgstr ""
 
-#: functions.php:284
+#: functions.php:290
 msgid "Newer posts <span class=\"meta-nav\">&rarr;</span>"
 msgstr ""
 
-#: functions.php:309
+#: functions.php:317
 msgid "Pingback:"
 msgstr ""
 
-#: functions.php:309
+#: functions.php:317
 msgid "(Edit)"
 msgstr ""
 
-#: functions.php:324
+#: functions.php:332
 msgid "Post author"
 msgstr ""
 
 #. translators: 1: date, 2: time
-#: functions.php:330
+#: functions.php:338
 msgid "%1$s at %2$s"
 msgstr ""
 
-#: functions.php:336
+#: functions.php:344
 msgid "Your comment is awaiting moderation."
 msgstr ""
 
-#: functions.php:345
+#: functions.php:353
 msgid "Reply"
 msgstr ""
 
 #. Translators: used between list items, there is a space after the comma.
-#: functions.php:364 functions.php:367
+#: functions.php:376 functions.php:379
 msgid ", "
 msgstr ""
 
-#: functions.php:378
+#: functions.php:390
 msgid "View all posts by %s"
 msgstr ""
 
 #. Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's
 #. name.
-#: functions.php:384
+#: functions.php:396
 msgid ""
 "This entry was posted in %1$s and tagged %2$s on %3$s<span class=\"by-author"
 "\"> by %4$s</span>."
 msgstr ""
 
-#: functions.php:386
+#: functions.php:398
 msgid ""
 "This entry was posted in %1$s on %3$s<span class=\"by-author\"> by %4$s</"
 "span>."
 msgstr ""
 
-#: functions.php:388
+#: functions.php:400
 msgid "This entry was posted on %3$s<span class=\"by-author\"> by %4$s</span>."
 msgstr ""
 

wp-content/themes/twentytwelve/style.css

@@ -4,7 +4,7 @@ Theme URI: http://wordpress.org/themes/twentytwelve
 Author: the WordPress team
 Author URI: http://wordpress.org/
 Description: The 2012 theme for WordPress is a fully responsive theme that looks great on any device. Features include a front page template with its own widgets, an optional display font, styling for post formats on both index and single views, and an optional no-sidebar page template. Make it yours with a custom menu, header image, and background.
-Version: 1.2
+Version: 1.3
 License: GNU General Public License v2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Tags: light, gray, white, one-column, two-columns, right-sidebar, flexible-width, custom-background, custom-header, custom-menu, editor-style, featured-images, flexible-header, full-width-template, microformats, post-formats, rtl-language-support, sticky-post, theme-options, translation-ready

wp-includes/css/jquery-ui-dialog.min.css

@@ -25,4 +25,4 @@
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Dialog#theming
- */.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:21px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:0;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.wp-dialog{padding:0;z-index:300002;border:1px solid #999;-webkit-box-shadow:0 0 16px rgba(0,0,0,.3);box-shadow:0 0 16px rgba(0,0,0,.3);background-color:#f5f5f5;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-webkit-border-top-right-radius:4px;border-top-right-radius:4px}.wp-dialog .ui-dialog-title{display:block;text-align:center;padding:1px 0 2px}.wp-dialog .ui-dialog-titlebar{padding:0 1em;background-color:#444;font-weight:700;font-size:11px;line-height:18px;color:#e5e5e5;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px}.wp-dialog .ui-dialog-content{padding:0}.wp-dialog .ui-dialog-titlebar-close{cursor:pointer;-webkit-appearance:none;border:0;width:29px;height:16px;top:13px;right:6px;background:url(../js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif) no-repeat -87px -16px}.wp-dialog .ui-dialog-titlebar-close .ui-button-text{display:none}.wp-dialog .ui-dialog-titlebar-close:hover,.wp-dialog .ui-dialog-titlebar-close:focus{background-position:-87px -32px}.ui-widget-overlay{z-index:300001;background-color:#000;opacity:.6;filter:alpha(opacity=60)}
+ */.ui-dialog{position:absolute;top:0;left:0;padding:.2em;outline:0}.ui-dialog .ui-dialog-titlebar{padding:.4em 1em;position:relative}.ui-dialog .ui-dialog-title{float:left;margin:.1em 0;white-space:nowrap;width:90%;overflow:hidden;text-overflow:ellipsis}.ui-dialog .ui-dialog-titlebar-close{position:absolute;right:.3em;top:50%;width:21px;margin:-10px 0 0 0;padding:1px;height:20px}.ui-dialog .ui-dialog-content{position:relative;border:0;padding:.5em 1em;background:0 0;overflow:auto}.ui-dialog .ui-dialog-buttonpane{text-align:left;border-width:1px 0 0;background-image:none;margin-top:.5em;padding:.3em 1em .5em .4em}.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset{float:right}.ui-dialog .ui-dialog-buttonpane button{margin:.5em .4em .5em 0;cursor:pointer}.ui-dialog .ui-resizable-se{width:12px;height:12px;right:-5px;bottom:-5px;background-position:16px 16px}.ui-draggable .ui-dialog-titlebar{cursor:move}.wp-dialog{padding:0;z-index:300002;border:1px solid #999;-webkit-box-shadow:0 0 16px rgba(0,0,0,.3);box-shadow:0 0 16px rgba(0,0,0,.3);background-color:#f5f5f5;-webkit-border-top-left-radius:4px;border-top-left-radius:4px;-webkit-border-top-right-radius:4px;border-top-right-radius:4px}.wp-dialog .ui-dialog-title{display:block;text-align:center;padding:1px 0 2px}.wp-dialog .ui-dialog-titlebar{padding:0 1em;background-color:#444;font-weight:700;font-size:11px;line-height:18px;color:#e5e5e5;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px}.wp-dialog .ui-dialog-content{padding:0}.wp-dialog .ui-dialog-titlebar-close{cursor:pointer;-webkit-appearance:none;border:0;width:29px;height:16px;top:13px;right:6px;background:url(../js/tinymce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif) no-repeat -87px -16px}.wp-dialog .ui-dialog-titlebar-close .ui-button-text{display:none}.wp-dialog .ui-dialog-titlebar-close:hover,.wp-dialog .ui-dialog-titlebar-close:focus{background-position:-87px -32px}.ui-widget-overlay{z-index:300001;background-color:#000;opacity:.6;filter:alpha(opacity=60)}

wp-includes/js/tinymce/plugins/wpdialogs/js/popup.min.js

@@ -1 +1 @@
-var tinyMCEPopup={init:function(){var a,b=this;a=b.getWin(),tinymce=a.tinymce,tinyMCE=a.tinyMCE,b.editor=tinymce.EditorManager.activeEditor,b.params=b.editor.windowManager.params,b.features=b.editor.windowManager.features,b.dom=tinymce.dom,b.listeners=[],b.onInit={add:function(a,c){b.listeners.push({func:a,scope:c})}},b.isWindow=!1,b.id=b.features.id,b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return window},getWindowArg:function(a,b){var c=this.params[a];return tinymce.is(c)?c:b},getParam:function(a,b){return this.editor.getParam(a,b)},getLang:function(a,b){return this.editor.getLang(a,b)},execCommand:function(a,b,c,d){return d=d||{},d.skip_focus=1,this.restoreSelection(),this.editor.execCommand(a,b,c,d)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},0)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;!a.isWindow&&tinymce.isIE&&a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)},requireLangPack:function(){var a=this,b=a.getWindowArg("plugin_url")||a.getWindowArg("theme_url");b&&a.editor.settings.language&&a.features.translate_i18n!==!1&&(b+="/langs/"+a.editor.settings.language+"_dlg.js",tinymce.ScriptLoader.isDone(b)||(document.write('<script type="text/javascript" src="'+tinymce._addVer(b)+'"></script>'),tinymce.ScriptLoader.markDone(b)))},pickColor:function(a,b){this.execCommand("mceColorPicker",!0,{color:document.getElementById(b).value,func:function(a){document.getElementById(b).value=a;try{document.getElementById(b).onchange()}catch(c){}}})},openBrowser:function(a,b){tinyMCEPopup.restoreSelection(),this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,b,window)},confirm:function(a,b,c){this.editor.windowManager.confirm(a,b,c,window)},alert:function(a,b,c){this.editor.windowManager.alert(a,b,c,window)},close:function(){function a(){b.editor.windowManager.close(window),b.editor=null}var b=this;tinymce.isOpera?b.getWin().setTimeout(a,0):a()},_restoreSelection:function(a){var b=a&&a.target?a.target:window.event.srcElement;"INPUT"!=b.nodeName||"submit"!=b.type&&"button"!=b.type||tinyMCEPopup.restoreSelection()},_onDOMLoaded:function(){var a,b,c=tinyMCEPopup,d=document.title;c.domLoaded||(c.domLoaded=1,tinyMCEPopup.init(),c.features.translate_i18n!==!1&&(a=document.body.innerHTML,tinymce.isIE&&(a=a.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')),document.dir=c.editor.getParam("directionality",""),(b=c.editor.translate(a))&&b!=a&&(document.body.innerHTML=b),(b=c.editor.translate(d))&&b!=d&&(document.title=d=b)),document.body.style.display="",tinymce.isIE&&!tinymce.isIE11?(document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection),c.dom.add(c.dom.select("head")[0],"base",{target:"_self"})):tinymce.isIE11&&document.addEventListener("mouseup",tinyMCEPopup._restoreSelection,!1),c.restoreSelection(),c.isWindow?window.focus():c.editor.windowManager.setTitle(window,d),tinymce.isIE||c.isWindow||tinymce.dom.Event._add(document,"focus",function(){c.editor.windowManager.focus(c.id)}),tinymce.each(c.dom.select("select"),function(a){a.onkeydown=tinyMCEPopup._accessHandler}),tinymce.each(c.listeners,function(a){a.func.call(a.scope,c.editor)}),c.getWindowArg("mce_auto_focus",!0)&&(window.focus(),tinymce.each(document.forms,function(a){tinymce.each(a.elements,function(a){return c.dom.hasClass(a,"mceFocus")&&!a.disabled?(a.focus(),!1):void 0})})),document.onkeyup=tinyMCEPopup._closeWinKeyHandler)},_accessHandler:function(a){return a=a||window.event,13==a.keyCode||32==a.keyCode?(a=a.target||a.srcElement,a.onchange&&a.onchange(),tinymce.dom.Event.cancel(a)):void 0},_closeWinKeyHandler:function(a){a=a||window.event,27==a.keyCode&&tinyMCEPopup.close()},_wait:function(){document.attachEvent?(document.attachEvent("onreadystatechange",function(){"complete"===document.readyState&&(document.detachEvent("onreadystatechange",arguments.callee),tinyMCEPopup._onDOMLoaded())}),document.documentElement.doScroll&&window==window.top&&function(){if(!tinyMCEPopup.domLoaded){try{document.documentElement.doScroll("left")}catch(a){return setTimeout(arguments.callee,0),void 0}tinyMCEPopup._onDOMLoaded()}}(),document.attachEvent("onload",tinyMCEPopup._onDOMLoaded)):document.addEventListener&&(window.addEventListener("DOMContentLoaded",tinyMCEPopup._onDOMLoaded,!1),window.addEventListener("load",tinyMCEPopup._onDOMLoaded,!1))}};
+var tinyMCEPopup={init:function(){var a,b=this;a=b.getWin(),tinymce=a.tinymce,tinyMCE=a.tinyMCE,b.editor=tinymce.EditorManager.activeEditor,b.params=b.editor.windowManager.params,b.features=b.editor.windowManager.features,b.dom=tinymce.dom,b.listeners=[],b.onInit={add:function(a,c){b.listeners.push({func:a,scope:c})}},b.isWindow=!1,b.id=b.features.id,b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return window},getWindowArg:function(a,b){var c=this.params[a];return tinymce.is(c)?c:b},getParam:function(a,b){return this.editor.getParam(a,b)},getLang:function(a,b){return this.editor.getLang(a,b)},execCommand:function(a,b,c,d){return d=d||{},d.skip_focus=1,this.restoreSelection(),this.editor.execCommand(a,b,c,d)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},0)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;!a.isWindow&&tinymce.isIE&&a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)},requireLangPack:function(){var a=this,b=a.getWindowArg("plugin_url")||a.getWindowArg("theme_url");b&&a.editor.settings.language&&a.features.translate_i18n!==!1&&(b+="/langs/"+a.editor.settings.language+"_dlg.js",tinymce.ScriptLoader.isDone(b)||(document.write('<script type="text/javascript" src="'+tinymce._addVer(b)+'"></script>'),tinymce.ScriptLoader.markDone(b)))},pickColor:function(a,b){this.execCommand("mceColorPicker",!0,{color:document.getElementById(b).value,func:function(a){document.getElementById(b).value=a;try{document.getElementById(b).onchange()}catch(c){}}})},openBrowser:function(a,b){tinyMCEPopup.restoreSelection(),this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,b,window)},confirm:function(a,b,c){this.editor.windowManager.confirm(a,b,c,window)},alert:function(a,b,c){this.editor.windowManager.alert(a,b,c,window)},close:function(){function a(){b.editor.windowManager.close(window),b.editor=null}var b=this;tinymce.isOpera?b.getWin().setTimeout(a,0):a()},_restoreSelection:function(a){var b=a&&a.target?a.target:window.event.srcElement;"INPUT"!=b.nodeName||"submit"!=b.type&&"button"!=b.type||tinyMCEPopup.restoreSelection()},_onDOMLoaded:function(){var a,b,c=tinyMCEPopup,d=document.title;c.domLoaded||(c.domLoaded=1,tinyMCEPopup.init(),c.features.translate_i18n!==!1&&(a=document.body.innerHTML,tinymce.isIE&&(a=a.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')),document.dir=c.editor.getParam("directionality",""),(b=c.editor.translate(a))&&b!=a&&(document.body.innerHTML=b),(b=c.editor.translate(d))&&b!=d&&(document.title=d=b)),document.body.style.display="",tinymce.isIE&&!tinymce.isIE11?(document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection),c.dom.add(c.dom.select("head")[0],"base",{target:"_self"})):tinymce.isIE11&&document.addEventListener("mouseup",tinyMCEPopup._restoreSelection,!1),c.restoreSelection(),c.isWindow?window.focus():c.editor.windowManager.setTitle(window,d),tinymce.isIE||c.isWindow||tinymce.dom.Event._add(document,"focus",function(){c.editor.windowManager.focus(c.id)}),tinymce.each(c.dom.select("select"),function(a){a.onkeydown=tinyMCEPopup._accessHandler}),tinymce.each(c.listeners,function(a){a.func.call(a.scope,c.editor)}),c.getWindowArg("mce_auto_focus",!0)&&(window.focus(),tinymce.each(document.forms,function(a){tinymce.each(a.elements,function(a){return c.dom.hasClass(a,"mceFocus")&&!a.disabled?(a.focus(),!1):void 0})})),document.onkeyup=tinyMCEPopup._closeWinKeyHandler)},_accessHandler:function(a){return a=a||window.event,13==a.keyCode||32==a.keyCode?(a=a.target||a.srcElement,a.onchange&&a.onchange(),tinymce.dom.Event.cancel(a)):void 0},_closeWinKeyHandler:function(a){a=a||window.event,27==a.keyCode&&tinyMCEPopup.close()},_wait:function(){document.attachEvent?(document.attachEvent("onreadystatechange",function(){"complete"===document.readyState&&(document.detachEvent("onreadystatechange",arguments.callee),tinyMCEPopup._onDOMLoaded())}),document.documentElement.doScroll&&window==window.top&&!function(){if(!tinyMCEPopup.domLoaded){try{document.documentElement.doScroll("left")}catch(a){return setTimeout(arguments.callee,0),void 0}tinyMCEPopup._onDOMLoaded()}}(),document.attachEvent("onload",tinyMCEPopup._onDOMLoaded)):document.addEventListener&&(window.addEventListener("DOMContentLoaded",tinyMCEPopup._onDOMLoaded,!1),window.addEventListener("load",tinyMCEPopup._onDOMLoaded,!1))}};

wp-includes/js/zxcvbn-async.min.js

@@ -1 +1 @@
-!function(){var a=function(){var a,b;return b=document.createElement("script"),b.src=_zxcvbnSettings.src,b.type="text/javascript",b.async=!0,a=document.getElementsByTagName("script")[0],a.parentNode.insertBefore(b,a)};null!=window.attachEvent?window.attachEvent("onload",a):window.addEventListener("load",a,!1)}.call(this);
+(function(){var a=function(){var a,b;return b=document.createElement("script"),b.src=_zxcvbnSettings.src,b.type="text/javascript",b.async=!0,a=document.getElementsByTagName("script")[0],a.parentNode.insertBefore(b,a)};null!=window.attachEvent?window.attachEvent("onload",a):window.addEventListener("load",a,!1)}).call(this);

wp-includes/pluggable.php

@@ -1700,6 +1700,7 @@ function get_avatar( $id_or_email, $size = '96', $default = '', $alt = false ) {
 		if ( !empty( $rating ) )
 			$out .= "&r={$rating}";
 
+		$out = str_replace( '&', '&', esc_url( $out ) );
 		$avatar = "<img alt='{$safe_alt}' src='{$out}' class='avatar avatar-{$size} photo' height='{$size}' width='{$size}' />";
 	} else {
 		$avatar = "<img alt='{$safe_alt}' src='{$default}' class='avatar avatar-{$size} photo avatar-default' height='{$size}' width='{$size}' />";

wp-includes/query.php

@@ -2629,7 +2629,7 @@ class WP_Query {
 		// Order search results by relevance only when another "orderby" is not specified in the query.
 		if ( ! empty( $q['s'] ) ) {
 			$search_orderby = '';
-			if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || 'relevance' === $q['orderby'] )
+			if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || ( isset( $q['orderby'] ) && 'relevance' === $q['orderby'] ) )
 				$search_orderby = $this->parse_search_order( $q );
 
 			/**

wp-includes/version.php

@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '3.7-RC2';
+$wp_version = '3.8-alpha';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.