Umherirrender has submitted this change and it was merged.
Change subject: Swap DO_MAINTENANCE to RUN_MAINTENANCE_IF_MAIN in maintenance
scripts
......................................................................
Swap DO_MAINTENANCE to RUN_MAINTENANCE_IF_MAIN in maintenance scripts
For consistency with core et al.
Change-Id: I16a606f8c871fb5228b81713a1dfaa1ca04c6fe6
---
M scripts/findSettings.php
M scripts/manage.php
M scripts/migrateFiles.php
M scripts/migrateToDB.php
M scripts/writePHP.php
5 files changed, 7 insertions(+), 8 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
Umherirrender: Verified; Looks good to me, approved
diff --git a/scripts/findSettings.php b/scripts/findSettings.php
index f0e31bb..78be91c 100644
--- a/scripts/findSettings.php
+++ b/scripts/findSettings.php
@@ -230,4 +230,4 @@
}
$maintClass = 'FindSettings';
-require_once( DO_MAINTENANCE );
+require_once RUN_MAINTENANCE_IF_MAIN;
\ No newline at end of file
diff --git a/scripts/manage.php b/scripts/manage.php
index f63081e..811a92c 100644
--- a/scripts/manage.php
+++ b/scripts/manage.php
@@ -24,7 +24,7 @@
$this->addOption( 'list', 'list all configurations files' );
$this->addOption( 'delete', 'delete the file corresponding to
the given version', false, true );
$this->addOption( 'revert', 'revert the working config to the
given version', false, true );
-
+
}
public function execute(){
@@ -98,4 +98,4 @@
}
$maintClass = 'ConfigurationManager';
-require_once( DO_MAINTENANCE );
+require_once RUN_MAINTENANCE_IF_MAIN;
\ No newline at end of file
diff --git a/scripts/migrateFiles.php b/scripts/migrateFiles.php
index 371c952..bdef099 100644
--- a/scripts/migrateFiles.php
+++ b/scripts/migrateFiles.php
@@ -33,7 +33,7 @@
if ( preg_match( '/^conf-(\d{14})\.ser$/', $file, $m )
|| $file == 'conf-now.ser' ) {
$old = "$dir/$file";
$new = substr( $old, 0, -3 ) . 'php';
-
+
$settings = unserialize( file_get_contents(
$old ) );
$cont = '<?php $settings = '.var_export(
$settings, true ).";";
@@ -47,4 +47,4 @@
}
$maintClass = 'MigrateFiles';
-require_once( DO_MAINTENANCE );
+require_once RUN_MAINTENANCE_IF_MAIN;
\ No newline at end of file
diff --git a/scripts/migrateToDB.php b/scripts/migrateToDB.php
index 4ff8bc8..0fbae46 100644
--- a/scripts/migrateToDB.php
+++ b/scripts/migrateToDB.php
@@ -90,5 +90,4 @@
}
$maintClass = 'FilesToDB';
-require_once( DO_MAINTENANCE );
-
+require_once RUN_MAINTENANCE_IF_MAIN;
\ No newline at end of file
diff --git a/scripts/writePHP.php b/scripts/writePHP.php
index fb260e9..3e338a7 100644
--- a/scripts/writePHP.php
+++ b/scripts/writePHP.php
@@ -327,4 +327,4 @@
}
$maintClass = 'ConfigurationWriter';
-require_once( DO_MAINTENANCE );
+require_once RUN_MAINTENANCE_IF_MAIN;
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/237877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I16a606f8c871fb5228b81713a1dfaa1ca04c6fe6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Configure
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Aklapper <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Umherirrender <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
