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
SECURITY: Handle -{}- syntax in attributes safely
[lhc/web/wiklou.git]
/
maintenance
/
Maintenance.php
diff --git
a/maintenance/Maintenance.php
b/maintenance/Maintenance.php
index
7de0ae4
..
d37b990
100644
(file)
--- a/
maintenance/Maintenance.php
+++ b/
maintenance/Maintenance.php
@@
-307,6
+307,17
@@
abstract class Maintenance {
return $this->hasArg( $argId ) ? $this->mArgs[$argId] : $default;
}
return $this->hasArg( $argId ) ? $this->mArgs[$argId] : $default;
}
+ /**
+ * Returns batch size
+ *
+ * @since 1.31
+ *
+ * @return int|null
+ */
+ protected function getBatchSize() {
+ return $this->mBatchSize;
+ }
+
/**
* Set the batch size.
* @param int $s The number of operations to do in a batch
/**
* Set the batch size.
* @param int $s The number of operations to do in a batch
@@
-1496,7
+1507,7
@@
abstract class Maintenance {
* @return string
*/
private static function readlineEmulation( $prompt ) {
* @return string
*/
private static function readlineEmulation( $prompt ) {
- $bash =
Installer::locateExecutableInDefaultPaths( [ 'bash' ]
);
+ $bash =
ExecutableFinder::findInDefaultPaths( 'bash'
);
if ( !wfIsWindows() && $bash ) {
$retval = false;
$encPrompt = wfEscapeShellArg( $prompt );
if ( !wfIsWindows() && $bash ) {
$retval = false;
$encPrompt = wfEscapeShellArg( $prompt );