From 4bd652d90e705c8b24570e0276d5caa0188f8ea6 Mon Sep 17 00:00:00 2001
From: Daniel Friesen <dantman@users.mediawiki.org>
Date: Mon, 20 Feb 2012 22:48:43 +0000
Subject: [PATCH] Revert RDFa and Microdata improvements to addMeta in r111439
 till after the git migration.

---
 includes/OutputPage.php | 30 +++++-------------------------
 1 file changed, 5 insertions(+), 25 deletions(-)

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index cb72a9d0b1..6c6c06b529 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -231,15 +231,6 @@ class OutputPage extends ContextSource {
 	 */
 	private $mRedirectedFrom = null;
 
-	/**
-	 * Name prefixes that can be used in addMeta
-	 */
-	public static $metaAttrPrefixes = array(
-		'http' => 'http-equiv',
-		'itemprop' => 'itemprop',
-		'property' => 'property',
-	);
-
 	/**
 	 * Constructor for OutputPage. This should not be called directly.
 	 * Instead a new RequestContext should be created and it will implicitly create
@@ -287,12 +278,6 @@ class OutputPage extends ContextSource {
 	/**
 	 * Add a new <meta> tag
 	 * To add an http-equiv meta tag, precede the name with "http:"
-	 * To add a Microdata itemprop meta tag, precede the name with "itemprop:"
-	 * To add a RDFa property meta tag, precede the name with "property:"
-	 *
-	 * itemprop: and property: were introduced in 1.20, you can feature
-	 * test for them by checking for the key in the new
-	 * OutputPage::$metaAttrPrefixes variable.
 	 *
 	 * @param $name String tag name
 	 * @param $val String tag value
@@ -3010,16 +2995,11 @@ $templates
 		}
 
 		foreach ( $this->mMetatags as $tag ) {
-			$a = 'name'; // default attribute
-			foreach ( self::$metaAttrPrefixes as $prefix => $attribute ) {
-				// Check if the name starts with the prefix
-				if ( strpos( $tag[0], "$prefix:" ) === 0 ) {
-					// Set the attribute name we're using
-					$a = $attribute;
-					// Strip the prefix from the name
-					$tag[0] = substr( $tag[0], strlen( $prefix ) + 1 );
-					break;
-				}
+			if ( 0 == strcasecmp( 'http:', substr( $tag[0], 0, 5 ) ) ) {
+				$a = 'http-equiv';
+				$tag[0] = substr( $tag[0], 5 );
+			} else {
+				$a = 'name';
 			}
 			$tags[] = Html::element( 'meta',
 				array(
-- 
2.20.1