Merge "Fix "UTPage" creation in tests"

[lhc/web/wiklou.git] / maintenance / updateDoubleWidthSearch.php

diff --git a/maintenance/updateDoubleWidthSearch.php b/maintenance/updateDoubleWidthSearch.php
index 0efc6a1..41988d1 100644 (file)
--- a/maintenance/updateDoubleWidthSearch.php
+++ b/maintenance/updateDoubleWidthSearch.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Script to normalize double-byte latin UTF-8 characters
+ * Normalize double-byte latin UTF-8 characters
  *
  * Usage: php updateDoubleWidthSearch.php
  *
@@ -23,8 +23,13 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once __DIR__ . '/Maintenance.php';
 
+/**
+ * Maintenance script to normalize double-byte latin UTF-8 characters.
+ *
+ * @ingroup Maintenance
+ */
 class UpdateDoubleWidthSearch extends Maintenance {
 
        public function __construct() {
@@ -39,14 +44,11 @@ class UpdateDoubleWidthSearch extends Maintenance {
        }
 
        public function execute() {
-               $quiet = $this->hasOption( 'q' );
                $maxLockTime = $this->getOption( 'l', 20 );
-               $lockTime = time();
 
                $dbw = wfGetDB( DB_MASTER );
                if ( $dbw->getType() !== 'mysql' ) {
-                       $this->output( "This change is only needed on MySQL, quitting.\n" );
-                       exit( 1 );
+                       $this->error( "This change is only needed on MySQL, quitting.\n", true );
                }
 
                $res = $this->findRows( $dbw );
@@ -63,11 +65,11 @@ class UpdateDoubleWidthSearch extends Maintenance {
                $searchindex = $dbw->tableName( 'searchindex' );
                $regexp = '[[:<:]]u8efbd([89][1-9a]|8[b-f]|90)[[:>:]]';
                $sql = "SELECT si_page FROM $searchindex
-                 WHERE ( si_text RLIKE '$regexp' )
-                    OR ( si_title RLIKE '$regexp' )";
+                                WHERE ( si_text RLIKE '$regexp' )
+                                       OR ( si_title RLIKE '$regexp' )";
                return $dbw->query( $sql, __METHOD__ );
        }
 }
 
 $maintClass = "UpdateDoubleWidthSearch";
-require_once( DO_MAINTENANCE );
+require_once RUN_MAINTENANCE_IF_MAIN;