return true;
}
+ $resolveableCount = 0;
+
$ok = true;
foreach ( $conflicts as $row ) {
$resolvable = $this->reportConflict( $row, $suffix );
$ok = $ok && $resolvable;
+
+ if ( $resolvable ) {
+ $resolveableCount++;
+ }
+
if ( $fix && ( $resolvable || $suffix != '' ) ) {
$ok = $this->resolveConflict( $row, $resolvable, $suffix ) && $ok;
}
}
+ $this->output( "{$count} conflicts. {$resolveableCount} are resolveable." );
+
return $ok;
}
/**
* @todo Do this for real
- * @param int $ns
- * @param string $name
+ * @param int $key
+ * @param string $prefix
* @param bool $fix
* @param string $suffix
* @return bool
$row->oldtitle,
$newTitle->getNamespace(),
$newTitle->getDBkey(),
- $newTitle->getPrefixedText() ) );
+ $newTitle->getPrefixedText() )
+ );
$id = $newTitle->getArticleID();
if ( $id ) {
/**
* Resolve any conflicts
*
- * @param stClass $row Row from the page table to fix
+ * @param stdClass $row Row from the page table to fix
* @param bool $resolvable
* @param string $suffix Suffix to append to the fixed page
* @return bool