| Index: branches/REL1_17/phase3/includes/installer/PostgresInstaller.php |
| — | — | @@ -278,7 +278,9 @@ |
| 279 | 279 | |
| 280 | 280 | $same = $this->getVar( 'wgDBuser' ) === $this->getVar( '_InstallUser' ); |
| 281 | 281 | |
| 282 | | - if ( !$same ) { |
| | 282 | + if ( $same ) { |
| | 283 | + $exists = true; |
| | 284 | + } else { |
| 283 | 285 | // Check if the web user exists |
| 284 | 286 | // Connect to the database with the install user |
| 285 | 287 | $status = $this->getPgConnection( 'create-db' ); |
| — | — | @@ -321,7 +323,7 @@ |
| 322 | 324 | // The web user is conventionally the table owner in PostgreSQL |
| 323 | 325 | // installations. Make sure the install user is able to create |
| 324 | 326 | // objects on behalf of the web user. |
| 325 | | - if ( $this->canCreateObjectsForWebUser() ) { |
| | 327 | + if ( $same || $this->canCreateObjectsForWebUser() ) { |
| 326 | 328 | return Status::newGood(); |
| 327 | 329 | } else { |
| 328 | 330 | return Status::newFatal( 'config-pg-not-in-role' ); |
| Property changes on: branches/REL1_17/phase3/includes/installer/PostgresInstaller.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 329 | 331 | Merged /branches/sqlite/includes/installer/PostgresInstaller.php:r58211-58321 |
| 330 | 332 | Merged /trunk/phase3/includes/installer/PostgresInstaller.php:r82845,82847-82848,84875,84881-84882,84970,84976,85021,85066,88658,89311,89529,89821,89839,89855 |
| 331 | 333 | Merged /branches/new-installer/phase3/includes/installer/PostgresInstaller.php:r43664-66004 |
| 332 | 334 | Merged /branches/wmf-deployment/includes/installer/PostgresInstaller.php:r53381 |
| 333 | 335 | Merged /branches/REL1_15/phase3/includes/installer/PostgresInstaller.php:r51646 |
| Index: branches/REL1_17/phase3/RELEASE-NOTES |
| — | — | @@ -39,8 +39,11 @@ |
| 40 | 40 | upgrade PHP prior to upgrading MediaWiki. |
| 41 | 41 | |
| 42 | 42 | === Changes since 1.17.0rc1 === |
| | 43 | + |
| 43 | 44 | * Fixed syntax error in generated LocalSettings.php when a non-default user |
| 44 | | -rights profile is chosen. |
| | 45 | + rights profile is chosen. |
| | 46 | +* (bug 29399) Fixed PostgreSQL installation when the DB user for installation |
| | 47 | + is the same as the one for web access. |
| 45 | 48 | |
| 46 | 49 | === Changes since 1.17 beta 1 === |
| 47 | 50 | |