| Index: trunk/phase3/config/Installer.php |
| — | — | @@ -621,7 +621,6 @@ |
| 622 | 622 | $conf->RootUser = importPost( "RootUser", "root" ); |
| 623 | 623 | $conf->RootPW = importPost( "RootPW", "" ); |
| 624 | 624 | $useRoot = importCheck( 'useroot', false ); |
| 625 | | - $conf->populateadmin = importCheck( 'populateadmin', false ); |
| 626 | 625 | $conf->LanguageCode = importPost( "LanguageCode", "en" ); |
| 627 | 626 | ## MySQL specific: |
| 628 | 627 | $conf->DBprefix = importPost( "DBprefix" ); |
| — | — | @@ -1557,8 +1556,6 @@ |
| 1558 | 1557 | <label class="column">Superuser account:</label> |
| 1559 | 1558 | <input type="checkbox" name="useroot" id="useroot" <?php if( $useRoot ) { ?>checked="checked" <?php } ?> /> |
| 1560 | 1559 | <label for="useroot">Use superuser account</label> |
| 1561 | | - <input type="checkbox" name="populateadmin" id="populateadmin" <?php if( $conf->populateadmin ) { ?>checked="checked" <?php } ?> /> |
| 1562 | | - <label for="populateadmin">Set as admin user for maintenance</label> |
| 1563 | 1560 | </div> |
| 1564 | 1561 | <div class="config-input"><?php aField( $conf, "RootUser", "Superuser name:", "text" ); ?></div> |
| 1565 | 1562 | <div class="config-input"><?php aField( $conf, "RootPW", "Superuser password:", "password" ); ?></div> |
| — | — | @@ -1824,11 +1821,6 @@ |
| 1825 | 1822 | # Needs literal string interpolation for the current style path |
| 1826 | 1823 | $slconf['RightsIcon'] = $conf->RightsIcon; |
| 1827 | 1824 | } |
| 1828 | | - |
| 1829 | | - if( $conf->populateadmin ) { |
| 1830 | | - $slconf['DBadminuser'] = $conf->RootUser; |
| 1831 | | - $slconf['DBadminpassword'] = $conf->RootPW; |
| 1832 | | - } |
| 1833 | 1825 | |
| 1834 | 1826 | if( $conf->DBtype == 'mysql' ) { |
| 1835 | 1827 | $dbsettings = |
| — | — | @@ -1933,10 +1925,6 @@ |
| 1934 | 1926 | |
| 1935 | 1927 | {$dbsettings} |
| 1936 | 1928 | |
| 1937 | | -## Database admin settings, used for maintenance scripts |
| 1938 | | -\$wgDBadminuser = \"". ($conf->populateadmin ? $slconf['DBadminuser'] : '' )."\"; |
| 1939 | | -\$wgDBadminpassword = \"". ($conf->populateadmin ? $slconf['DBadminpassword'] : '' )."\"; |
| 1940 | | - |
| 1941 | 1929 | ## Shared memory settings |
| 1942 | 1930 | \$wgMainCacheType = $cacheType; |
| 1943 | 1931 | \$wgMemCachedServers = $mcservers; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -151,7 +151,6 @@ |
| 152 | 152 | * If config/ directory is not executable, the command to make it executable |
| 153 | 153 | now asks the user to cd to the correct directory |
| 154 | 154 | * Add experimental new external authentication framework, ExternalAuth |
| 155 | | -* (bug 14201) Set $wgDBadminuser/$wgDBadminpassword during setup |
| 156 | 155 | * (bug 18768) Remove AdminSettings requirements. Maintenance environment |
| 157 | 156 | will still load it if it exists, but it's not required for anything |
| 158 | 157 | * (bug 19900) The "listgrouprights-key" message is now wrapped in a div with |