From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 27 Dec 2014 15:41:37 +0100
Subject: Update to MediaWiki 1.24.1

---
 includes/api/ApiFormatYaml.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'includes/api/ApiFormatYaml.php')

diff --git a/includes/api/ApiFormatYaml.php b/includes/api/ApiFormatYaml.php
index 700d4a5e..3798f894 100644
--- a/includes/api/ApiFormatYaml.php
+++ b/includes/api/ApiFormatYaml.php
@@ -26,6 +26,7 @@
 
 /**
  * API YAML output formatter
+ * @deprecated since 1.24
  * @ingroup API
  */
 class ApiFormatYaml extends ApiFormatJson {
@@ -34,7 +35,12 @@ class ApiFormatYaml extends ApiFormatJson {
 		return 'application/yaml';
 	}
 
+	public function execute() {
+		$this->markDeprecated();
+		parent::execute();
+	}
+
 	public function getDescription() {
-		return 'Output data in YAML format' . ApiFormatBase::getDescription();
+		return 'DEPRECATED! Output data in YAML format' . ApiFormatBase::getDescription();
 	}
 }
-- 
cgit v1.2.3-54-g00ecf