ialex at svn
Feb 11, 2012, 6:36 AM
Post #1 of 1
(11 views)
Permalink
|
|
SVN: [111234] trunk/phase3/includes
|
|
https://www.mediawiki.org/wiki/Special:Code/MediaWiki/111234
Revision: 111234
Author: ialex
Date: 2012-02-11 14:36:36 +0000 (Sat, 11 Feb 2012)
Log Message:
-----------
Remove some methods marked for removal in 1.20 and update FakeTitle accordingly.
No more callers in core or extensions.
Modified Paths:
--------------
trunk/phase3/includes/FakeTitle.php
trunk/phase3/includes/Preferences.php
trunk/phase3/includes/Title.php
trunk/phase3/includes/parser/ParserOptions.php
Modified: trunk/phase3/includes/FakeTitle.php
===================================================================
--- trunk/phase3/includes/FakeTitle.php 2012-02-11 14:20:21 UTC (rev 111233)
+++ trunk/phase3/includes/FakeTitle.php 2012-02-11 14:36:36 UTC (rev 111234)
@@ -46,7 +46,6 @@
function isNamespaceProtected( User $user ) { $this->error(); }
function userCan( $action, $user = null, $doExpensiveQueries = true ) { $this->error(); }
function getUserPermissionsErrors( $action, $user, $doExpensiveQueries = true, $ignoreErrors = array() ) { $this->error(); }
- function updateTitleProtection( $create_perm, $reason, $expiry ) { $this->error(); }
function deleteTitleProtection() { $this->error(); }
function isMovable() { $this->error(); }
function userCanRead() { $this->error(); }
@@ -59,9 +58,6 @@
function getSkinFromCssJsSubpage() { $this->error(); }
function isCssSubpage() { $this->error(); }
function isJsSubpage() { $this->error(); }
- function userCanEditCssJsSubpage() { $this->error(); }
- function userCanEditCssSubpage() { $this->error(); }
- function userCanEditJsSubpage() { $this->error(); }
function isCascadeProtected() { $this->error(); }
function getCascadeProtectionSources( $get_pages = true ) { $this->error(); }
function areRestrictionsCascading() { $this->error(); }
Modified: trunk/phase3/includes/Preferences.php
===================================================================
--- trunk/phase3/includes/Preferences.php 2012-02-11 14:20:21 UTC (rev 111233)
+++ trunk/phase3/includes/Preferences.php 2012-02-11 14:36:36 UTC (rev 111234)
@@ -1461,27 +1461,6 @@
return array( true, $info );
}
-
- /**
- * @deprecated in 1.19; will be removed in 1.20.
- * @param $user User
- * @return array
- */
- public static function loadOldSearchNs( $user ) {
- wfDeprecated( __METHOD__, '1.19' );
-
- $searchableNamespaces = SearchEngine::searchableNamespaces();
- // Back compat with old format
- $arr = array();
-
- foreach ( $searchableNamespaces as $ns => $name ) {
- if ( $user->getOption( 'searchNs' . $ns ) ) {
- $arr[] = $ns;
- }
- }
-
- return $arr;
- }
}
/** Some tweaks to allow js prefs to work */
Modified: trunk/phase3/includes/Title.php
===================================================================
--- trunk/phase3/includes/Title.php 2012-02-11 14:20:21 UTC (rev 111233)
+++ trunk/phase3/includes/Title.php 2012-02-11 14:36:36 UTC (rev 111234)
@@ -2129,34 +2129,6 @@
}
/**
- * Protect css subpages of user pages: can $wgUser edit
- * this page?
- *
- * @deprecated in 1.19; will be removed in 1.20. Use getUserPermissionsErrors() instead.
- * @return Bool
- */
- public function userCanEditCssSubpage() {
- global $wgUser;
- wfDeprecated( __METHOD__, '1.19' );
- return ( ( $wgUser->isAllowedAll( 'editusercssjs', 'editusercss' ) )
- || preg_match( '/^' . preg_quote( $wgUser->getName(), '/' ) . '\//', $this->mTextform ) );
- }
-
- /**
- * Protect js subpages of user pages: can $wgUser edit
- * this page?
- *
- * @deprecated in 1.19; will be removed in 1.20. Use getUserPermissionsErrors() instead.
- * @return Bool
- */
- public function userCanEditJsSubpage() {
- global $wgUser;
- wfDeprecated( __METHOD__, '1.19' );
- return ( ( $wgUser->isAllowedAll( 'editusercssjs', 'edituserjs' ) )
- || preg_match( '/^' . preg_quote( $wgUser->getName(), '/' ) . '\//', $this->mTextform ) );
- }
-
- /**
* Get a filtered list of all restriction types supported by this wiki.
* @param bool $exists True to get all restriction types that apply to
* titles that do exist, False for all restriction types that apply to
@@ -2232,29 +2204,6 @@
}
/**
- * Update the title protection status
- *
- * @deprecated in 1.19; will be removed in 1.20. Use WikiPage::doUpdateRestrictions() instead.
- * @param $create_perm String Permission required for creation
- * @param $reason String Reason for protection
- * @param $expiry String Expiry timestamp
- * @return boolean true
- */
- public function updateTitleProtection( $create_perm, $reason, $expiry ) {
- wfDeprecated( __METHOD__, '1.19' );
-
- global $wgUser;
-
- $limit = array( 'create' => $create_perm );
- $expiry = array( 'create' => $expiry );
-
- $page = WikiPage::factory( $this );
- $status = $page->doUpdateRestrictions( $limit, $expiry, false, $reason, $wgUser );
-
- return $status->isOK();
- }
-
- /**
* Remove any title protection due to page existing
*/
public function deleteTitleProtection() {
Modified: trunk/phase3/includes/parser/ParserOptions.php
===================================================================
--- trunk/phase3/includes/parser/ParserOptions.php 2012-02-11 14:20:21 UTC (rev 111233)
+++ trunk/phase3/includes/parser/ParserOptions.php 2012-02-11 14:36:36 UTC (rev 111234)
@@ -278,9 +278,6 @@
function setNumberHeadings( $x ) { return wfSetVar( $this->mNumberHeadings, $x ); }
function setAllowSpecialInclusion( $x ) { return wfSetVar( $this->mAllowSpecialInclusion, $x ); }
function setTidy( $x ) { return wfSetVar( $this->mTidy, $x ); }
-
- /** @deprecated in 1.19; will be removed in 1.20 */
- function setSkin( $x ) { wfDeprecated( __METHOD__, '1.19' ); }
function setInterfaceMessage( $x ) { return wfSetVar( $this->mInterfaceMessage, $x ); }
function setTargetLanguage( $x ) { return wfSetVar( $this->mTargetLanguage, $x, true ); }
function setMaxIncludeSize( $x ) { return wfSetVar( $this->mMaxIncludeSize, $x ); }
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS [at] lists
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
