dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Detect already-undone edits for undo"
[lhc/web/wiklou.git]
/
maintenance
/
Maintenance.php
diff --git
a/maintenance/Maintenance.php
b/maintenance/Maintenance.php
index
30e93c9
..
fb2cd8c
100644
(file)
--- a/
maintenance/Maintenance.php
+++ b/
maintenance/Maintenance.php
@@
-787,7
+787,6
@@
abstract class Maintenance {
$this->output( "\n" );
}
$this->output( "\n" );
}
-
// Script specific parameters not defined on construction by
// Maintenance::addDefaultParams()
$scriptSpecificParams = array_diff_key(
// Script specific parameters not defined on construction by
// Maintenance::addDefaultParams()
$scriptSpecificParams = array_diff_key(
@@
-1274,9
+1273,9
@@
abstract class LoggedUpdateMaintenance extends Maintenance {
$db = $this->getDB( DB_MASTER );
$key = $this->getUpdateKey();
$db = $this->getDB( DB_MASTER );
$key = $this->getUpdateKey();
- if ( !$this->hasOption( 'force' )
&&
-
$db->selectRow( 'updatelog', '1', array( 'ul_key' => $key ), __METHOD__ )
)
- {
+ if ( !$this->hasOption( 'force' )
+
&& $db->selectRow( 'updatelog', '1', array( 'ul_key' => $key ), __METHOD__
)
+
)
{
$this->output( "..." . $this->updateSkippedMessage() . "\n" );
return true;
}
$this->output( "..." . $this->updateSkippedMessage() . "\n" );
return true;
}
@@
-1285,9
+1284,7
@@
abstract class LoggedUpdateMaintenance extends Maintenance {
return false;
}
return false;
}
- if (
- $db->insert( 'updatelog', array( 'ul_key' => $key ), __METHOD__, 'IGNORE' ) )
- {
+ if ( $db->insert( 'updatelog', array( 'ul_key' => $key ), __METHOD__, 'IGNORE' ) ) {
return true;
} else {
$this->output( $this->updatelogFailedMessage() . "\n" );
return true;
} else {
$this->output( $this->updatelogFailedMessage() . "\n" );