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 "Fix CLI installer when --dbname is not specified on command line."
[lhc/web/wiklou.git]
/
includes
/
installer
/
Installer.php
diff --git
a/includes/installer/Installer.php
b/includes/installer/Installer.php
index
dd12cea
..
de84199
100644
(file)
--- a/
includes/installer/Installer.php
+++ b/
includes/installer/Installer.php
@@
-282,15
+282,15
@@
abstract class Installer {
*/
public $licenses = array(
'cc-by' => array(
*/
public $licenses = array(
'cc-by' => array(
- 'url' => 'https://creativecommons.org/licenses/by/
3
.0/',
+ 'url' => 'https://creativecommons.org/licenses/by/
4
.0/',
'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by.png',
),
'cc-by-sa' => array(
'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by.png',
),
'cc-by-sa' => array(
- 'url' => 'https://creativecommons.org/licenses/by-sa/
3
.0/',
+ 'url' => 'https://creativecommons.org/licenses/by-sa/
4
.0/',
'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by-sa.png',
),
'cc-by-nc-sa' => array(
'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by-sa.png',
),
'cc-by-nc-sa' => array(
- 'url' => 'https://creativecommons.org/licenses/by-nc-sa/
3
.0/',
+ 'url' => 'https://creativecommons.org/licenses/by-nc-sa/
4
.0/',
'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by-nc-sa.png',
),
'cc-0' => array(
'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-by-nc-sa.png',
),
'cc-0' => array(
@@
-884,7
+884,13
@@
abstract class Installer {
}
if ( !$caches ) {
}
if ( !$caches ) {
- $this->showMessage( 'config-no-cache' );
+ $key = 'config-no-cache';
+ // PHP >=5.5 is called APCu, earlier versions use APC (T61998).
+ if ( !wfIsHHVM() && version_compare( PHP_VERSION, '5.5', '>=' ) ) {
+ // config-no-cache-apcu
+ $key .= '-apcu';
+ }
+ $this->showMessage( $key );
}
$this->setVar( '_Caches', $caches );
}
$this->setVar( '_Caches', $caches );