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
Merge "registration: Let extensions add PHP version requirements"
[lhc/web/wiklou.git]
/
includes
/
specials
/
SpecialVersion.php
diff --git
a/includes/specials/SpecialVersion.php
b/includes/specials/SpecialVersion.php
index
48728a3
..
35c5689
100644
(file)
--- a/
includes/specials/SpecialVersion.php
+++ b/
includes/specials/SpecialVersion.php
@@
-233,8
+233,8
@@
class SpecialVersion extends SpecialPage {
}
$software[$dbr->getSoftwareLink()] = $dbr->getServerInfo();
}
$software[$dbr->getSoftwareLink()] = $dbr->getServerInfo();
- if (
IcuCollation::getICUVersion(
) ) {
- $software['[http://site.icu-project.org/ ICU]'] = I
cuCollation::getICUVersion()
;
+ if (
defined( 'INTL_ICU_VERSION'
) ) {
+ $software['[http://site.icu-project.org/ ICU]'] = I
NTL_ICU_VERSION
;
}
// Allow a hook to add/remove items.
}
// Allow a hook to add/remove items.
@@
-396,7
+396,7
@@
class SpecialVersion extends SpecialPage {
public static function getExtensionTypeName( $type ) {
$types = self::getExtensionTypes();
public static function getExtensionTypeName( $type ) {
$types = self::getExtensionTypes();
- return
isset( $types[$type] ) ? $types[$type] :
$types['other'];
+ return
$types[$type] ??
$types['other'];
}
/**
}
/**
@@
-658,13
+658,7
@@
class SpecialVersion extends SpecialPage {
* @return int
*/
public function compare( $a, $b ) {
* @return int
*/
public function compare( $a, $b ) {
- if ( $a['name'] === $b['name'] ) {
- return 0;
- } else {
- return $this->getLanguage()->lc( $a['name'] ) > $this->getLanguage()->lc( $b['name'] )
- ? 1
- : -1;
- }
+ return $this->getLanguage()->lc( $a['name'] ) <=> $this->getLanguage()->lc( $b['name'] );
}
/**
}
/**
@@
-838,7
+832,7
@@
class SpecialVersion extends SpecialPage {
$description = $out->parseInline( $description );
// ... now get the authors for this extension
$description = $out->parseInline( $description );
// ... now get the authors for this extension
- $authors =
isset( $extension['author'] ) ? $extension['author'] :
[];
+ $authors =
$extension['author'] ??
[];
$authors = $this->listAuthors( $authors, $extension['name'], $extensionPath );
// Finally! Create the table
$authors = $this->listAuthors( $authors, $extension['name'], $extensionPath );
// Finally! Create the table
@@
-1140,7
+1134,7
@@
class SpecialVersion extends SpecialPage {
*/
public function getEntryPointInfo() {
global $wgArticlePath, $wgScriptPath;
*/
public function getEntryPointInfo() {
global $wgArticlePath, $wgScriptPath;
- $scriptPath = $wgScriptPath ?
$wgScriptPath
: "/";
+ $scriptPath = $wgScriptPath ?: "/";
$entryPoints = [
'version-entrypoints-articlepath' => $wgArticlePath,
'version-entrypoints-scriptpath' => $scriptPath,
$entryPoints = [
'version-entrypoints-articlepath' => $wgArticlePath,
'version-entrypoints-scriptpath' => $scriptPath,