}
$self = array_shift( $argv );
+$self = __FILE__;
$IP = realpath( dirname( $self ) . "/.." );
chdir( $IP );
@ob_end_flush();
$sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":";
-if ( $sep == ":" && strpos( `hostname`, "wikimedia.org" ) !== false ) {
+if (!isset( $wgUseNormalUser ) ) {
+ $wgUseNormalUser = false;
+}
+
+if ( file_exists( '/home/wikipedia/common/langlist' ) ) {
$wgWikiFarm = true;
require_once( "$IP/includes/SiteConfiguration.php" );
# This is for the IRC scripts, which now run as the apache user
# The apache user doesn't have access to the wikiadmin_pass command
- if ( $_ENV['USER'] != "apache" ) {
+ if ( $_ENV['USER'] == "apache" ) {
+ $wgUseNormalUser = true;
+ }
+
+ if ( !$wgUseNormalUser ) {
$wgDBuser = $wgDBadminuser = "wikiadmin";
$wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`);
}
ini_set( "include_path", ".:$IP:$IP/includes:$IP/languages:$IP/maintenance" );
require_once( "$IP/includes/Defines.php" );
- require_once( "/home/wikipedia/common/php-1.4/CommonSettings.php" );
+ require_once( "$IP/CommonSettings.php" );
} else {
$wgWikiFarm = false;
$settingsFile = "$IP/LocalSettings.php";
@ob_end_flush();
# Same with these
$wgCommandLineMode = true;
-$wgDBuser = $wgDBadminuser;
-$wgDBpassword = $wgDBadminpassword;
if ( !empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
$wgDBuser = $wgDBadminuser;