$wgCommandLineMode = true;
# Turn off output buffering if it's on
@ob_end_flush();
-$sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":";
+$sep = PATH_SEPARATOR;
if (!isset( $wgUseNormalUser ) ) {
$wgUseNormalUser = false;
require_once( "$IP/includes/Defines.php" );
require_once( "$IP/CommonSettings.php" );
- if ( !$wgUseNormalUser ) {
+ if ( $wgUseRootUser ) {
+ $wgDBuser = $wgDBadminuser = "root";
+ $wgDBpassword = $wgDBadminpassword = trim(`mysql_root_pass`);
+ } elseif ( !$wgUseNormalUser ) {
$wgDBuser = $wgDBadminuser = "wikiadmin";
$wgDBpassword = $wgDBadminpassword = trim(`wikiadmin_pass`);
}
# Same with these
$wgCommandLineMode = true;
-if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) ) {
+if ( empty( $wgUseNormalUser ) && isset( $wgDBadminuser ) && $wgDBservers ) {
$wgDBuser = $wgDBadminuser;
$wgDBpassword = $wgDBadminpassword;
}
}
+if ( defined( 'MW_CMDLINE_CALLBACK' ) ) {
+ $fn = MW_CMDLINE_CALLBACK;
+ $fn();
+}
+
ini_set( 'memory_limit', -1 );
require_once( "Setup.php" );