dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove deprecated function ApiBase::getModuleProfileName
[lhc/web/wiklou.git]
/
includes
/
api
/
ApiBase.php
diff --git
a/includes/api/ApiBase.php
b/includes/api/ApiBase.php
index
228d319
..
6bfdbac
100644
(file)
--- a/
includes/api/ApiBase.php
+++ b/
includes/api/ApiBase.php
@@
-1615,6
+1615,10
@@
abstract class ApiBase extends ContextSource {
* @return string Validated and normalized parameter
*/
private function validateUser( $value, $encParamName ) {
* @return string Validated and normalized parameter
*/
private function validateUser( $value, $encParamName ) {
+ if ( ExternalUserNames::isExternal( $value ) && User::newFromName( $value, false ) ) {
+ return $value;
+ }
+
$title = Title::makeTitleSafe( NS_USER, $value );
if ( $title === null || $title->hasFragment() ) {
$this->dieWithError(
$title = Title::makeTitleSafe( NS_USER, $value );
if ( $title === null || $title->hasFragment() ) {
$this->dieWithError(
@@
-2461,7
+2465,7
@@
abstract class ApiBase extends ContextSource {
realpath( __DIR__ ) ?: __DIR__ => [
'path' => $IP,
'name' => 'MediaWiki',
realpath( __DIR__ ) ?: __DIR__ => [
'path' => $IP,
'name' => 'MediaWiki',
- 'license-name' => 'GPL-2.0
+
',
+ 'license-name' => 'GPL-2.0
-or-later
',
],
realpath( "$IP/extensions" ) ?: "$IP/extensions" => null,
realpath( $extDir ) ?: $extDir => null,
],
realpath( "$IP/extensions" ) ?: "$IP/extensions" => null,
realpath( $extDir ) ?: $extDir => null,
@@
-2585,16
+2589,6
@@
abstract class ApiBase extends ContextSource {
return false;
}
return false;
}
- /**
- * @deprecated since 1.25, always returns empty string
- * @param IDatabase|bool $db
- * @return string
- */
- public function getModuleProfileName( $db = false ) {
- wfDeprecated( __METHOD__, '1.25' );
- return '';
- }
-
/**
* @deprecated since 1.25
*/
/**
* @deprecated since 1.25
*/
@@
-2641,15
+2635,6
@@
abstract class ApiBase extends ContextSource {
wfDeprecated( __METHOD__, '1.25' );
}
wfDeprecated( __METHOD__, '1.25' );
}
- /**
- * @deprecated since 1.25, always returns 0
- * @return float
- */
- public function getProfileDBTime() {
- wfDeprecated( __METHOD__, '1.25' );
- return 0;
- }
-
/**
* Call wfTransactionalTimeLimit() if this request was POSTed
* @since 1.26
/**
* Call wfTransactionalTimeLimit() if this request was POSTed
* @since 1.26