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 "Improve "selfmove" message's wording"
[lhc/web/wiklou.git]
/
includes
/
libs
/
rdbms
/
ChronologyProtector.php
diff --git
a/includes/libs/rdbms/ChronologyProtector.php
b/includes/libs/rdbms/ChronologyProtector.php
index
f002d3e
..
8121654
100644
(file)
--- a/
includes/libs/rdbms/ChronologyProtector.php
+++ b/
includes/libs/rdbms/ChronologyProtector.php
@@
-315,7
+315,7
@@
class ChronologyProtector implements LoggerAwareInterface {
* @return array
*/
private static function mergePositions( $curValue, array $shutdownPositions ) {
* @return array
*/
private static function mergePositions( $curValue, array $shutdownPositions ) {
- /** @var
$curPositions DBMasterPos[]
*/
+ /** @var
DBMasterPos[] $curPositions
*/
if ( $curValue === false ) {
$curPositions = $shutdownPositions;
} else {
if ( $curValue === false ) {
$curPositions = $shutdownPositions;
} else {