r83772 MediaWiki - Code Review archive

Repository:	MediaWiki
Revision:	< r83771‎ \| r83772 \| r83773 >
Date:	18:14, 12 March 2011
Author:	happy-melon
Status:	ok
Tags:
Comment:	Follow-up r83755: @deprecated @since is wrong, doesn't have the expected semantic meaning.
Modified paths:	/trunk/phase3/includes/Article.php (modified) (history) /trunk/phase3/includes/DefaultSettings.php (modified) (history) /trunk/phase3/includes/HTMLForm.php (modified) (history) /trunk/phase3/includes/Linker.php (modified) (history) /trunk/phase3/includes/OutputPage.php (modified) (history) /trunk/phase3/includes/Title.php (modified) (history) /trunk/phase3/includes/User.php (modified) (history) /trunk/phase3/includes/specials/SpecialBlockip.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/User.php
—	—	@@ -2697,7 +2697,7 @@
2698	2698	* which will give them a chance to modify this key based on their own
2699	2699	* settings.
2700	2700	*
2701		~~- * @deprecated @since 1.17 use the ParserOptions object to get the relevant options~~
	2701	+ * @deprecated since 1.17 use the ParserOptions object to get the relevant options
2702	2702	* @return String Page rendering hash
2703	2703	*/
2704	2704	function getPageRenderingHash() {
Index: trunk/phase3/includes/Article.php
—	—	@@ -159,7 +159,7 @@
160	160	*
161	161	* @param $text string article content containing redirect info
162	162	* @return mixed false, Title of in-wiki target, or string with URL
163		~~- * @deprecated @since 1.17~~
	163	+ * @deprecated since 1.17
164	164	*/
165	165	public function followRedirectText( $text ) {
166	166	// recurse through to only get the final target
—	—	@@ -1936,7 +1936,7 @@
1937	1937	}
1938	1938
1939	1939	/**
1940		~~- * @deprecated @since 1.7 use Article::doEdit()~~
	1940	+ * @deprecated since 1.7 use Article::doEdit()
1941	1941	*/
1942	1942	function insertNewArticle( $text, $summary, $isminor, $watchthis, $suppressRC = false, $comment = false, $bot = false ) {
1943	1943	wfDeprecated( __METHOD__ );
—	—	@@ -1970,7 +1970,7 @@
1971	1971	}
1972	1972
1973	1973	/**
1974		~~- * @deprecated @since 1.7 use Article::doEdit()~~
	1974	+ * @deprecated since 1.7 use Article::doEdit()
1975	1975	*/
1976	1976	function updateArticle( $text, $summary, $minor, $watchthis, $forceBot = false, $sectionanchor = '' ) {
1977	1977	wfDeprecated( __METHOD__ );
Index: trunk/phase3/includes/Linker.php
—	—	@@ -344,7 +344,7 @@
345	345	* @param $trail String
346	346	* @param $prefix String
347	347	* @return string HTML of link
348		~~- * @deprecated @since 1.17~~
	348	+ * @deprecated since 1.17
349	349	*/
350	350	function makeSizeLinkObj( $size, $nt, $text = '', $query = '', $trail = '', $prefix = '' ) {
351	351	global $wgUser;
—	—	@@ -1765,7 +1765,7 @@
1766	1766	/* Deprecated methods */
1767	1767
1768	1768	/**
1769		~~- * @deprecated @since 1.16 Use link()~~
	1769	+ * @deprecated since 1.16 Use link()
1770	1770	*
1771	1771	* This function is a shortcut to makeLinkObj(Title::newFromText($title),...). Do not call
1772	1772	* it if you already have a title object handy. See makeLinkObj for further documentation.
—	—	@@ -1792,7 +1792,7 @@
1793	1793	}
1794	1794
1795	1795	/**
1796		~~- * @deprecated @since 1.16 Use link()~~
	1796	+ * @deprecated since 1.16 Use link()
1797	1797	*
1798	1798	* This function is a shortcut to makeKnownLinkObj(Title::newFromText($title),...). Do not call
1799	1799	* it if you already have a title object handy. See makeKnownLinkObj for further documentation.
—	—	@@ -1817,7 +1817,7 @@
1818	1818	}
1819	1819
1820	1820	/**
1821		~~- * @deprecated @since 1.16 Use link()~~
	1821	+ * @deprecated since 1.16 Use link()
1822	1822	*
1823	1823	* This function is a shortcut to makeBrokenLinkObj(Title::newFromText($title),...). Do not call
1824	1824	* it if you already have a title object handy. See makeBrokenLinkObj for further documentation.
—	—	@@ -1840,7 +1840,7 @@
1841	1841	}
1842	1842
1843	1843	/**
1844		~~- * @deprecated @since 1.16 Use link()~~
	1844	+ * @deprecated since 1.16 Use link()
1845	1845	*
1846	1846	* This function is a shortcut to makeStubLinkObj(Title::newFromText($title),...). Do not call
1847	1847	* it if you already have a title object handy. See makeStubLinkObj for further documentation.
—	—	@@ -1864,7 +1864,7 @@
1865	1865	}
1866	1866
1867	1867	/**
1868		~~- * @deprecated @since 1.16 Use link()~~
	1868	+ * @deprecated since 1.16 Use link()
1869	1869	*
1870	1870	* Make a link for a title which may or may not be in the database. If you need to
1871	1871	* call this lots of times, pre-fill the link cache with a LinkBatch, otherwise each
—	—	@@ -1894,7 +1894,7 @@
1895	1895	}
1896	1896
1897	1897	/**
1898		~~- * @deprecated @since 1.16 Use link()~~
	1898	+ * @deprecated since 1.16 Use link()
1899	1899	*
1900	1900	* Make a link for a title which definitely exists. This is faster than makeLinkObj because
1901	1901	* it doesn't have to do a database query. It's also valid for interwiki titles and special
—	—	@@ -1930,7 +1930,7 @@
1931	1931	}
1932	1932
1933	1933	/**
1934		~~- * @deprecated @since 1.16 Use link()~~
	1934	+ * @deprecated since 1.16 Use link()
1935	1935	*
1936	1936	* Make a red link to the edit page of a given title.
1937	1937	*
—	—	@@ -1958,7 +1958,7 @@
1959	1959	}
1960	1960
1961	1961	/**
1962		~~- * @deprecated @since 1.16 Use link()~~
	1962	+ * @deprecated since 1.16 Use link()
1963	1963	*
1964	1964	* Make a brown link to a short article.
1965	1965	*
—	—	@@ -1975,7 +1975,7 @@
1976	1976	}
1977	1977
1978	1978	/**
1979		~~- * @deprecated @since 1.16 Use link()~~
	1979	+ * @deprecated since 1.16 Use link()
1980	1980	*
1981	1981	* Make a coloured link.
1982	1982	*
—	—	@@ -2005,7 +2005,7 @@
2006	2006
2007	2007	/**
2008	2008	* Creates the HTML source for images
2009		~~- * @deprecated @since 1.16 use makeImageLink2~~
	2009	+ * @deprecated since 1.16 use makeImageLink2
2010	2010	*
2011	2011	* @param $title Title object
2012	2012	* @param $label String: label text
—	—	@@ -2071,7 +2071,7 @@
2072	2072	}
2073	2073
2074	2074	/**
2075		~~- * @deprecated @since 1.14~~
	2075	+ * @deprecated since 1.14
2076	2076	* Returns raw bits of HTML, use titleAttrib() and accesskey()
2077	2077	*/
2078	2078	public function tooltipAndAccesskey( $name ) {
—	—	@@ -2079,7 +2079,7 @@
2080	2080	}
2081	2081
2082	2082	/**
2083		~~- * @deprecated @since 1.14~~
	2083	+ * @deprecated since 1.14
2084	2084	* Returns raw bits of HTML, use titleAttrib()
2085	2085	*/
2086	2086	public function tooltip( $name, $options = null ) {
Index: trunk/phase3/includes/HTMLForm.php
—	—	@@ -159,7 +159,7 @@
160	160	/**
161	161	* Add the HTMLForm-specific JavaScript, if it hasn't been
162	162	* done already.
163		~~- * @deprecated @since 1.18 load modules with ResourceLoader instead~~
	163	+ * @deprecated since 1.18 load modules with ResourceLoader instead
164	164	*/
165	165	static function addJS() { }
166	166
Index: trunk/phase3/includes/OutputPage.php
—	—	@@ -1092,7 +1092,7 @@
1093	1093
1094	1094	/**
1095	1095	* Return whether user JavaScript is allowed for this page
1096		~~- * @deprecated @since 1.18 Load modules with ResourceLoader, and origin and~~
	1096	+ * @deprecated since 1.18 Load modules with ResourceLoader, and origin and
1097	1097	* trustworthiness is identified and enforced automagically.
1098	1098	* @return Boolean
1099	1099	*/
—	—	@@ -3075,7 +3075,7 @@
3076	3076	* @param $modules Array: list of jQuery modules which should be loaded
3077	3077	* @return Array: the list of modules which were not loaded.
3078	3078	* @since 1.16
3079		~~- * @deprecated @since 1.17~~
	3079	+ * @deprecated since 1.17
3080	3080	*/
3081	3081	public function includeJQuery( $modules = array() ) {
3082	3082	return array();
Index: trunk/phase3/includes/Title.php
—	—	@@ -1955,7 +1955,7 @@
1956	1956	* Is this a valid .css or .js subpage of a user page?
1957	1957	*
1958	1958	* @return Bool
1959		~~- * @deprecated @since 1.17~~
	1959	+ * @deprecated since 1.17
1960	1960	*/
1961	1961	public function isValidCssJsSubpage() {
1962	1962	return $this->isCssJsSubpage();
Index: trunk/phase3/includes/DefaultSettings.php
—	—	@@ -3177,13 +3177,13 @@
3178	3178
3179	3179	/**
3180	3180	* Allow sysops to ban logged-in users
3181		~~- * @deprecated @since 1.18~~
	3181	+ * @deprecated since 1.18
3182	3182	*/
3183	3183	$wgSysopUserBans = true;
3184	3184
3185	3185	/**
3186	3186	* Allow sysops to ban IP ranges
3187		~~- * @deprecated @since 1.18; set $wgBlockCIDRLimit to array( 'IPv4' => 32, 'IPv6 => 128 ) instead.~~
	3187	+ * @deprecated since 1.18; set $wgBlockCIDRLimit to array( 'IPv4' => 32, 'IPv6 => 128 ) instead.
3188	3188	*/
3189	3189	$wgSysopRangeBans = true;
3190	3190
Index: trunk/phase3/includes/specials/SpecialBlockip.php
—	—	@@ -590,12 +590,12 @@
591	591	}
592	592	}
593	593
594		~~- # @deprecated @since 1.18~~
	594	+ # @deprecated since 1.18
595	595	public static function suppressUserName( $name, $userId, $dbw = null ) {
596	596	return RevisionDeleteUser::suppressUserName( $name, $userId, $dbw );
597	597	}
598	598
599		~~- # @deprecated @since 1.18~~
	599	+ # @deprecated since 1.18
600	600	public static function unsuppressUserName( $name, $userId, $dbw = null ) {
601	601	return RevisionDeleteUser::unsuppressUserName( $name, $userId, $dbw );
602	602	}

Sign-offs

User	Flag	Date
Platonides	inspected	19:19, 13 March 2011

Past revisions this follows-up on

Revision	Commit summary	Author	Date
r83755	Deprecate $wgSysopUserBans and $wgSysopRangeBans, both of which are pre-1.2, ...	happy-melon	12:13, 12 March 2011

Status & tagging log

12:48, 26 March 2011 Hashar (talk | contribs) changed the status of r83772 [removed: new added: ok]