| Index: trunk/phase3/maintenance/namespaceDupes.php |
| — | — | @@ -200,7 +200,8 @@ |
| 201 | 201 | $sql = "SELECT {$page}_id AS id, |
| 202 | 202 | {$page}_title AS oldtitle, |
| 203 | 203 | $encNamespace + {$page}_namespace AS namespace, |
| 204 | | - $titleSql AS title |
| | 204 | + $titleSql AS title, |
| | 205 | + {$page}_namespace AS oldnamespace |
| 205 | 206 | FROM {$table} |
| 206 | 207 | WHERE ( {$page}_namespace=0 OR {$page}_namespace=1 ) |
| 207 | 208 | AND {$page}_title " . $this->db->buildLike( $name . ':', $this->db->anyString() ); |
| — | — | @@ -224,15 +225,17 @@ |
| 225 | 226 | if( is_null($newTitle) || !$newTitle->canExist() ) { |
| 226 | 227 | // Title is also an illegal title... |
| 227 | 228 | // For the moment we'll let these slide to cleanupTitles or whoever. |
| 228 | | - $this->output( sprintf( "... %d (0,\"%s\")\n", |
| | 229 | + $this->output( sprintf( "... %d (%d,\"%s\")\n", |
| 229 | 230 | $row->id, |
| | 231 | + $row->oldnamespace, |
| 230 | 232 | $row->oldtitle ) ); |
| 231 | 233 | $this->output( "... *** cannot resolve automatically; illegal title ***\n" ); |
| 232 | 234 | return false; |
| 233 | 235 | } |
| 234 | 236 | |
| 235 | | - $this->output( sprintf( "... %d (0,\"%s\") -> (%d,\"%s\") [[%s]]\n", |
| | 237 | + $this->output( sprintf( "... %d (%d,\"%s\") -> (%d,\"%s\") [[%s]]\n", |
| 236 | 238 | $row->id, |
| | 239 | + $row->oldnamespace, |
| 237 | 240 | $row->oldtitle, |
| 238 | 241 | $newTitle->getNamespace(), |
| 239 | 242 | $newTitle->getDBkey(), |
| — | — | @@ -291,8 +294,9 @@ |
| 292 | 295 | "{$prefix}_title" => $newTitle->getDBkey(), |
| 293 | 296 | ), |
| 294 | 297 | array( |
| 295 | | - "{$prefix}_namespace" => 0, |
| 296 | | - "{$prefix}_title" => $row->oldtitle, |
| | 298 | + // "{$prefix}_namespace" => 0, |
| | 299 | + // "{$prefix}_title" => $row->oldtitle, |
| | 300 | + "{$prefix}_id" => $row->id, |
| 297 | 301 | ), |
| 298 | 302 | __METHOD__ ); |
| 299 | 303 | $this->output( "ok.\n" ); |