jenkins-bot has submitted this change and it was merged.
Change subject: Installer: properly override default $wgLogo value
......................................................................
Installer: properly override default $wgLogo value
Setup.php uses the value of $wgScriptPath in $wgLogo before the
installer determines the former, so it is necessary to override
the latter even before the WebInstaller_Options page is shown
(because it might never be shown).
Bug: 48084
Change-Id: Icc577c1bb1f78adc7a7cfb0581ae8ea2facba4cf
---
M RELEASE-NOTES-1.23
M includes/installer/Installer.php
M includes/installer/WebInstallerPage.php
3 files changed, 6 insertions(+), 6 deletions(-)
Approvals:
devunt: Looks good to me, but someone else must approve
Waldir: Looks good to me, but someone else must approve
MarkAHershberger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 379b219..1fcb757 100644
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -168,6 +168,8 @@
no longer applies in such cases.
* (bug 60960) Avoid doing file_exist() checks on data: URIs, as they cause
warnings to be printed on Windows due to large path length.
+* (bug 48084) Fixed a bug in the installer that could cause $wgLogo to hold
+ the wrong path to the placeholder logo (skins/common/images/wiki.png).
=== Web API changes in 1.23 ===
* (bug 54884) action=parse&prop=categories now indicates hidden and missing
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 55ca014..d667ae6 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -170,7 +170,6 @@
'wgMetaNamespace',
'wgDeletedDirectory',
'wgEnableUploads',
- 'wgLogo',
'wgShellLocale',
'wgSecretKey',
'wgUseInstantCommons',
@@ -211,6 +210,10 @@
'_MemCachedServers' => '',
'_UpgradeKeySupplied' => false,
'_ExistingDBSettings' => false,
+
+ // $wgLogo is probably wrong (bug 48084); set something that
will work.
+ // Single quotes work fine here, as LocalSettingsGenerator
outputs this unescaped.
+ 'wgLogo' => '$wgStylePath/common/images/wiki.png',
);
/**
diff --git a/includes/installer/WebInstallerPage.php
b/includes/installer/WebInstallerPage.php
index 4bc6cad..3b50d8c 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -969,10 +969,6 @@
$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(
@@ -994,7 +990,6 @@
'</div>' .
$this->parent->getTextBox( array(
'var' => 'wgLogo',
- 'value' => $logoString,
'label' => 'config-logo',
'attribs' => array( 'dir' => 'ltr' ),
'help' => $this->parent->getHelpBox(
'config-logo-help' )
--
To view, visit https://gerrit.wikimedia.org/r/85959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc577c1bb1f78adc7a7cfb0581ae8ea2facba4cf
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: PleaseStand <pleasest...@live.com>
Gerrit-Reviewer: Dereckson <dereck...@espace-win.org>
Gerrit-Reviewer: MarkAHershberger <m...@nichework.com>
Gerrit-Reviewer: Waldir <wal...@email.com>
Gerrit-Reviewer: devunt <dev...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
