add 2.1.1 from https://plugins.svn.wordpress.org/wordpress-seo/tags/2…

….1.1/

admin/class-admin-init.php

@@ -32,7 +32,7 @@ public function __construct() {
 
 		$this->pagenow = $GLOBALS['pagenow'];
 
-		$this->redirect_to_about_page();
+		add_action( 'admin_init', array( $this, 'redirect_to_about_page' ), 15 );
 		$this->load_meta_boxes();
 		$this->load_taxonomy_class();
 		$this->load_admin_page_class();
@@ -45,7 +45,7 @@ public function __construct() {
 	/**
 	 * Redirect first time or just upgraded users to the about screen.
 	 */
-	private function redirect_to_about_page() {
+	public function redirect_to_about_page() {
 		if ( ! current_user_can( 'manage_options' ) ) {
 			return;
 		}

frontend/class-frontend.php

@@ -1910,10 +1910,12 @@ protected function output( $context ) {
 		 */
 		$this->data = apply_filters( 'wpseo_json_ld_output', $this->data, $context );
 
-		if ( ! is_array( $this->data ) || empty( $this->data ) ) {
-			return;
+		if ( is_array( $this->data ) && ! empty( $this->data ) ) {
+			echo "<script type='application/ld+json'>", json_encode( $this->data ), '</script>', "\n";
 		}
-		echo "<script type='application/ld+json'>", json_encode( $this->data ), '</script>', "\n";
+
+		// Empty the $data array so we don't output it twice.
+		$this->data = array();
 	}
 
 	/**

frontend/class-opengraph.php

@@ -466,15 +466,26 @@ public function type( $echo = true ) {
 
 	/**
 	 * Create new WPSEO_OpenGraph_Image class and get the images to set the og:image
+	 *
+	 * @param mixed $image
 	 */
-	public function image() {
-		$opengraph_images = new WPSEO_OpenGraph_Image( $this->options );
+	public function image( $image = false ) {
+		$opengraph_images = new WPSEO_OpenGraph_Image( $this->options, $image );
 
 		foreach ( $opengraph_images->get_images() as $img ) {
 			$this->og_tag( 'og:image', esc_url( $img ) );
 		}
 	}
 
+	/**
+	 * Fallback method for plugins using image_output
+	 *
+	 * @param string $image
+	 */
+	public function image_output( $image ) {
+		$this->image( $image );
+	}
+
 	/**
 	 * Output the OpenGraph description, specific OG description first, if not, grab the meta description.
 	 *
@@ -660,11 +671,16 @@ class WPSEO_OpenGraph_Image {
 	/**
 	 * Constructor
 	 *
-	 * @param array $options
+	 * @param array      $options
+	 * @param bool|mixed $image
 	 */
-	public function __construct( $options ) {
+	public function __construct( $options, $image = false ) {
 		$this->options = $options;
 		$this->set_images();
+
+		if ( ! empty( $image ) ) {
+			$this->add_image( $image );
+		}
 	}
 
 	/**

readme.txt

@@ -6,7 +6,7 @@ License URI: http://www.gnu.org/licenses/gpl.html
 Tags: seo, SEO, Yoast SEO, google, meta, meta description, search engine optimization, xml sitemap, xml sitemaps, google sitemap, sitemap, sitemaps, robots meta, rss, rss footer, yahoo, bing, news sitemaps, XML News Sitemaps, WordPress SEO, WordPress SEO by Yoast, yoast, multisite, canonical, nofollow, noindex, keywords, meta keywords, description, webmaster tools, google webmaster tools, seo pack
 Requires at least: 3.9
 Tested up to: 4.2
-Stable tag: 2.1
+Stable tag: 2.1.1
 
 Improve your WordPress SEO: Write better content and have a fully optimized WordPress site using Yoast's WordPress SEO plugin.
 
@@ -120,6 +120,15 @@ You'll find the [FAQ on Yoast.com](https://yoast.com/wordpress/plugins/seo/faq/)
 
 == Changelog ==
 
+= 2.1.1 =
+
+Release Date: April 21st, 2015
+
+* Bugfixes:
+	* Fixes a bug where the JSON+LD output was outputted twice when company or person info wasn't set.
+	* Fixes a compatibility issue with Video SEO and WooCommerce SEO add-ons causing WSOD on the frontend for video's and WooCommerce products.
+	* Fixes a compatibility issue with BBPress caused by hooking `current_user_can` too early.
+
 = 2.1 =
 
 Release Date: April 20th, 2015

vendor/autoload.php

@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInit2e4780b73f9b3c06fa5f7f8f10bb4d3e::getLoader();
+return ComposerAutoloaderInit100d0d22a84dba6758b63403c72ccead::getLoader();

vendor/autoload_52.php

@@ -4,4 +4,4 @@
 
 require_once dirname(__FILE__) . '/composer'.'/autoload_real_52.php';
 
-return ComposerAutoloaderInit4aa4bf1f8ecc76764e32a62a639d7034::getLoader();
+return ComposerAutoloaderInitaba00416c8823961fe1bbc5399d21ab1::getLoader();

vendor/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInit2e4780b73f9b3c06fa5f7f8f10bb4d3e
+class ComposerAutoloaderInit100d0d22a84dba6758b63403c72ccead
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ public static function getLoader()
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInit2e4780b73f9b3c06fa5f7f8f10bb4d3e', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit100d0d22a84dba6758b63403c72ccead', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInit2e4780b73f9b3c06fa5f7f8f10bb4d3e', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit100d0d22a84dba6758b63403c72ccead', 'loadClassLoader'));
 
         $map = require __DIR__ . '/autoload_namespaces.php';
         foreach ($map as $namespace => $path) {
@@ -44,7 +44,7 @@ public static function getLoader()
     }
 }
 
-function composerRequire2e4780b73f9b3c06fa5f7f8f10bb4d3e($file)
+function composerRequire100d0d22a84dba6758b63403c72ccead($file)
 {
     require $file;
 }

vendor/composer/autoload_real_52.php

@@ -2,7 +2,7 @@
 
 // autoload_real_52.php generated by xrstf/composer-php52
 
-class ComposerAutoloaderInit4aa4bf1f8ecc76764e32a62a639d7034 {
+class ComposerAutoloaderInitaba00416c8823961fe1bbc5399d21ab1 {
 	private static $loader;
 
 	public static function loadClassLoader($class) {
@@ -19,9 +19,9 @@ public static function getLoader() {
 			return self::$loader;
 		}
 
-		spl_autoload_register(array('ComposerAutoloaderInit4aa4bf1f8ecc76764e32a62a639d7034', 'loadClassLoader'), true /*, true */);
+		spl_autoload_register(array('ComposerAutoloaderInitaba00416c8823961fe1bbc5399d21ab1', 'loadClassLoader'), true /*, true */);
 		self::$loader = $loader = new xrstf_Composer52_ClassLoader();
-		spl_autoload_unregister(array('ComposerAutoloaderInit4aa4bf1f8ecc76764e32a62a639d7034', 'loadClassLoader'));
+		spl_autoload_unregister(array('ComposerAutoloaderInitaba00416c8823961fe1bbc5399d21ab1', 'loadClassLoader'));
 
 		$vendorDir = dirname(dirname(__FILE__));
 		$baseDir   = dirname($vendorDir);

wp-seo-main.php

@@ -13,7 +13,7 @@
  * @internal Nobody should be able to overrule the real version number as this can cause serious issues
  * with the options, so no if ( ! defined() )
  */
-define( 'WPSEO_VERSION', '2.1' );
+define( 'WPSEO_VERSION', '2.1.1' );
 
 if ( ! defined( 'WPSEO_PATH' ) ) {
 	define( 'WPSEO_PATH', plugin_dir_path( WPSEO_FILE ) );

wp-seo.php

@@ -5,7 +5,7 @@
 
 /**
  * Plugin Name: WordPress SEO
- * Version: 2.1
+ * Version: 2.1.1
  * Plugin URI: https://yoast.com/wordpress/plugins/seo/#utm_source=wpadmin&utm_medium=plugin&utm_campaign=wpseoplugin
  * Description: The first true all-in-one SEO solution for WordPress, including on-page content analysis, XML sitemaps and much more.
  * Author: Team Yoast