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 "Installer: properly override default $wgLogo value"
[lhc/web/wiklou.git]
/
includes
/
installer
/
WebInstallerPage.php
diff --git
a/includes/installer/WebInstallerPage.php
b/includes/installer/WebInstallerPage.php
index
4de7f06
..
e1ee836
100644
(file)
--- a/
includes/installer/WebInstallerPage.php
+++ b/
includes/installer/WebInstallerPage.php
@@
-1049,10
+1049,6
@@
class WebInstaller_Options extends WebInstallerPage {
$this->getVar( 'wgDeletedDirectory' )
)
);
$this->getVar( 'wgDeletedDirectory' )
)
);
- // If we're using the default, let the user set it relative to $wgScriptPath
- $curLogo = $this->getVar( 'wgLogo' );
- $logoString = ( $curLogo == "/wiki/skins/common/images/wiki.png" ) ?
- '$wgStylePath/common/images/wiki.png' : $curLogo;
$uploadwrapperStyle = $this->getVar( 'wgEnableUploads' ) ? '' : 'display: none';
$this->addHTML(
$uploadwrapperStyle = $this->getVar( 'wgEnableUploads' ) ? '' : 'display: none';
$this->addHTML(
@@
-1074,7
+1070,6
@@
class WebInstaller_Options extends WebInstallerPage {
'</div>' .
$this->parent->getTextBox( array(
'var' => 'wgLogo',
'</div>' .
$this->parent->getTextBox( array(
'var' => 'wgLogo',
- 'value' => $logoString,
'label' => 'config-logo',
'attribs' => array( 'dir' => 'ltr' ),
'help' => $this->parent->getHelpBox( 'config-logo-help' )
'label' => 'config-logo',
'attribs' => array( 'dir' => 'ltr' ),
'help' => $this->parent->getHelpBox( 'config-logo-help' )