r101108 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r101107‎ | r101108 | r101109 >
Date:01:14, 28 October 2011
Author:aaron
Status:ok (Comments)
Tags:
Comment:
Removed useless usage of $wgUseNormalUser in WikimediaMaintenance. Maintenance doesn't even check this (only the legacy commandLine subclass does).
Modified paths:
  • /trunk/extensions/WikimediaMaintenance/WikimediaMaintenance.php (modified) (history)

Diff [purge]

Index: trunk/extensions/WikimediaMaintenance/WikimediaMaintenance.php
@@ -24,7 +24,7 @@
2525 * Override the core loadSettings.
2626 */
2727 public function loadSettings() {
28 - global $IP, $wgNoDBParam, $wgUseNormalUser, $wgConf, $site, $lang;
 28+ global $IP, $wgNoDBParam, $wgConf, $site, $lang;
2929
3030 if ( empty( $wgNoDBParam ) ) {
3131 # Check if we were passed a db name
@@ -53,13 +53,6 @@
5454 $site = 'wikipedia';
5555 }
5656
57 - # This is for the IRC scripts, which now run as the apache user
58 - # The apache user doesn't have access to the wikiadmin_pass command
59 - if ( $_ENV['USER'] == 'apache' ) {
60 - # if ( posix_geteuid() == 48 ) {
61 - $wgUseNormalUser = true;
62 - }
63 -
6457 putenv( 'wikilang=' . $lang );
6558
6659 ini_set( 'include_path', ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );

Comments

#Comment by Aaron Schulz (talk | contribs)   01:15, 28 October 2011

Also, $wgUseNormalUser was a hamfisted way of saying "use Maintenance::DB_STD", which is already the default.

Status & tagging log