http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90104
Revision: 90104
Author: tstarling
Date: 2011-06-15 03:48:58 +0000 (Wed, 15 Jun 2011)
Log Message:
-----------
MFT r89855 and base r89839 plus release notes, fixing bug 29399: PostgreSQL
installer broken with same install and web user
Modified Paths:
--------------
branches/REL1_17/phase3/RELEASE-NOTES
branches/REL1_17/phase3/includes/installer/PostgresInstaller.php
Property Changed:
----------------
branches/REL1_17/phase3/includes/installer/PostgresInstaller.php
Modified: branches/REL1_17/phase3/RELEASE-NOTES
===================================================================
--- branches/REL1_17/phase3/RELEASE-NOTES 2011-06-15 01:34:23 UTC (rev
90103)
+++ branches/REL1_17/phase3/RELEASE-NOTES 2011-06-15 03:48:58 UTC (rev
90104)
@@ -39,8 +39,11 @@
upgrade PHP prior to upgrading MediaWiki.
=== Changes since 1.17.0rc1 ===
+
* Fixed syntax error in generated LocalSettings.php when a non-default user
-rights profile is chosen.
+ rights profile is chosen.
+* (bug 29399) Fixed PostgreSQL installation when the DB user for installation
+ is the same as the one for web access.
=== Changes since 1.17 beta 1 ===
Modified: branches/REL1_17/phase3/includes/installer/PostgresInstaller.php
===================================================================
--- branches/REL1_17/phase3/includes/installer/PostgresInstaller.php
2011-06-15 01:34:23 UTC (rev 90103)
+++ branches/REL1_17/phase3/includes/installer/PostgresInstaller.php
2011-06-15 03:48:58 UTC (rev 90104)
@@ -278,7 +278,9 @@
$same = $this->getVar( 'wgDBuser' ) === $this->getVar(
'_InstallUser' );
- if ( !$same ) {
+ if ( $same ) {
+ $exists = true;
+ } else {
// Check if the web user exists
// Connect to the database with the install user
$status = $this->getPgConnection( 'create-db' );
@@ -321,7 +323,7 @@
// The web user is conventionally the table owner in PostgreSQL
// installations. Make sure the install user is able to create
// objects on behalf of the web user.
- if ( $this->canCreateObjectsForWebUser() ) {
+ if ( $same || $this->canCreateObjectsForWebUser() ) {
return Status::newGood();
} else {
return Status::newFatal( 'config-pg-not-in-role' );
Property changes on:
branches/REL1_17/phase3/includes/installer/PostgresInstaller.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/includes/installer/PostgresInstaller.php:51646
/branches/new-installer/phase3/includes/installer/PostgresInstaller.php:43664-66004
/branches/sqlite/includes/installer/PostgresInstaller.php:58211-58321
/branches/wmf-deployment/includes/installer/PostgresInstaller.php:53381
/trunk/phase3/includes/installer/PostgresInstaller.php:82845,82847-82848,84875,84881-84882,84970,84976,85021,85066,88658,89311,89529,89821,89839,89855
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
