Merge commit 'f6d65'

# Conflicts:
#	skins/ArchLinux/ArchLinux.php

1 files changed, 19 insertions, 0 deletions

diff --git a/extensions/SpamBlacklist/api/ApiSpamBlacklist.php b/extensions/SpamBlacklist/api/ApiSpamBlacklist.php
index dad9e8e0..9c5ce3db 100644
--- a/extensions/SpamBlacklist/api/ApiSpamBlacklist.php
+++ b/extensions/SpamBlacklist/api/ApiSpamBlacklist.php
@@ -55,16 +55,25 @@ class ApiSpamBlacklist extends ApiBase {
 		);
 	}
 
+	/**
+	 * @deprecated since MediaWiki core 1.25
+	 */
 	public function getParamDescription() {
 		return array(
 			'url' => 'A pipe-separated list of URLs to validate against the blacklist',
 		);
 	}
 
+	/**
+	 * @deprecated since MediaWiki core 1.25
+	 */
 	public function getDescription() {
 		return 'Validate one or more URLs against the SpamBlacklist.';
 	}
 
+	/**
+	 * @deprecated since MediaWiki core 1.25
+	 */
 	public function getExamples() {
 		return array(
 			'api.php?action=spamblacklist&url=http%3A%2F%2Fwww.example.com%2F%7Chttp%3A%2F%2Fwww.example.org%2F',
@@ -72,6 +81,16 @@ class ApiSpamBlacklist extends ApiBase {
 		);
 	}
 
+	/**
+	 * @see ApiBase::getExamplesMessages()
+	 */
+	protected function getExamplesMessages() {
+		return array(
+			'action=spamblacklist&url=http://www.example.com/|http://www.example.org/'
+				=> 'apihelp-spamblacklist-example-1',
+		);
+	}
+
 	public function getHelpUrls() {
 		return array( 'https://www.mediawiki.org/wiki/Extension:SpamBlacklist/API' );
 	}