From eb433b42a0d32cc1cbc96a089faa47be432be6e5 Mon Sep 17 00:00:00 2001 From: Platonides Date: Sat, 13 Feb 2010 23:58:30 +0000 Subject: [PATCH] Follow up r62436 comments. s/Title::newFromUrl/Title::newFromURL/ All these usages should be reviewed. Make it easy to grep using the canonical form. Additionally fix the typo. --- includes/parser/CoreParserFunctions.php | 2 +- includes/specials/SpecialListfiles.php | 2 +- includes/specials/SpecialNewimages.php | 2 +- maintenance/importTextFile.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php index b133cf7449..0f4d54514d 100644 --- a/includes/parser/CoreParserFunctions.php +++ b/includes/parser/CoreParserFunctions.php @@ -170,7 +170,7 @@ class CoreParserFunctions { # and the variable will fail. If we can't get a decent title from the first # attempt, url-decode and try for a second. if( is_null( $title ) ) - $title = Title::newFromUrl( urldecode( $s ) ); + $title = Title::newFromURL( urldecode( $s ) ); if( !is_null( $title ) ) { # Convert NS_MEDIA -> NS_FILE if( $title->getNamespace() == NS_MEDIA ) { diff --git a/includes/specials/SpecialListfiles.php b/includes/specials/SpecialListfiles.php index 788009764f..b93324227c 100644 --- a/includes/specials/SpecialListfiles.php +++ b/includes/specials/SpecialListfiles.php @@ -34,7 +34,7 @@ class ImageListPager extends TablePager { } $search = $wgRequest->getText( 'ilsearch' ); if ( $search != '' && !$wgMiserMode ) { - $nt = Title::newFromUrl( $search ); + $nt = Title::newFromURL( $search ); if( $nt ) { $dbr = wfGetDB( DB_SLAVE ); $this->mQueryConds = array( 'LOWER(img_name)' . $dbr->buildLike( $dbr->anyString(), diff --git a/includes/specials/SpecialNewimages.php b/includes/specials/SpecialNewimages.php index 61f5230c33..a39b56eef0 100644 --- a/includes/specials/SpecialNewimages.php +++ b/includes/specials/SpecialNewimages.php @@ -67,7 +67,7 @@ function wfSpecialNewimages( $par, $specialPage ) { $where = array(); $searchpar = array(); if ( $wpIlMatch != '' && !$wgMiserMode) { - $nt = Title::newFromUrl( $wpIlMatch ); + $nt = Title::newFromURL( $wpIlMatch ); if( $nt ) { $where[] = 'LOWER(img_name) ' . $dbr->buildLike( $dbr->anyString(), strtolower( $nt->getDBkey() ), $dbr->anyString() ); $searchpar['wpIlMatch'] = $wpIlMatch; diff --git a/maintenance/importTextFile.php b/maintenance/importTextFile.php index 9a6500f463..955d01f4dd 100644 --- a/maintenance/importTextFile.php +++ b/maintenance/importTextFile.php @@ -23,7 +23,7 @@ if( count( $args ) < 1 || isset( $options['help'] ) ) { if( is_file( $filename ) ) { $title = isset( $options['title'] ) ? $options['title'] : titleFromFilename( $filename ); - $title = Title::newFromUrl( $title ); + $title = Title::newFromURL( $title ); if( is_object( $title ) ) { -- 2.20.1