X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FcleanupImages.php;h=4e7b937dbf0cddcb3db6a5fa1b5a2eb426b3707c;hb=fcdf2518605954fe1bcf88598fc14bd95d525882;hp=81d1c85bdaf7340ba1bff747a87ddc8212513ef0;hpb=e336b5e951ed31eef3ddeb9c2e4abbb06f070c34;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupImages.php b/maintenance/cleanupImages.php
index 81d1c85bda..4e7b937dbf 100644
--- a/maintenance/cleanupImages.php
+++ b/maintenance/cleanupImages.php
@@ -1,12 +1,12 @@
 <?php
 /**
- * Script to clean up broken, unparseable upload filenames.
+ * Clean up broken, unparseable upload filenames.
  *
  * Usage: php cleanupImages.php [--fix]
  * Options:
  *   --fix  Actually clean up titles; otherwise just checks for them
  *
- * Copyright (C) 2005-2006 Brion Vibber <brion@pobox.com>
+ * Copyright © 2005-2006 Brion Vibber <brion@pobox.com>
  * http://www.mediawiki.org/
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29,8 +29,13 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/cleanupTable.inc' );
+require_once( __DIR__ . '/cleanupTable.inc' );
 
+/**
+ * Maintenance script to clean up broken, unparseable upload filenames.
+ *
+ * @ingroup Maintenance
+ */
 class ImageCleanup extends TableCleanup {
 	protected $defaultParams = array(
 		'table' => 'image',
@@ -156,7 +161,7 @@ class ImageCleanup extends TableCleanup {
 		} else {
 			$this->output( "renaming $path to $finalPath\n" );
 			// @todo FIXME: Should this use File::move()?
-			$db->begin();
+			$db->begin( __METHOD__ );
 			$db->update( 'image',
 				array( 'img_name' => $final ),
 				array( 'img_name' => $orig ),
@@ -173,15 +178,15 @@ class ImageCleanup extends TableCleanup {
 			if ( !file_exists( $dir ) ) {
 				if ( !wfMkdirParents( $dir, null, __METHOD__ ) ) {
 					$this->output( "RENAME FAILED, COULD NOT CREATE $dir" );
-					$db->rollback();
+					$db->rollback( __METHOD__ );
 					return;
 				}
 			}
 			if ( rename( $path, $finalPath ) ) {
-				$db->commit();
+				$db->commit( __METHOD__ );
 			} else {
 				$this->error( "RENAME FAILED" );
-				$db->rollback();
+				$db->rollback( __METHOD__ );
 			}
 		}
 	}
@@ -192,9 +197,8 @@ class ImageCleanup extends TableCleanup {
 	}
 
 	private function buildSafeTitle( $name ) {
-		global $wgLegalTitleChars;
 		$x = preg_replace_callback(
-			"/([^$wgLegalTitleChars]|~)/",
+			'/([^' . Title::legalChars() . ']|~)/',
 			array( $this, 'hexChar' ),
 			$name );