Merge "Fix typo for system message name"

diff --git a/includes/installer/MssqlUpdater.php b/includes/installer/MssqlUpdater.php
index 49e7b40..f9c4287 100644 (file)
--- a/includes/installer/MssqlUpdater.php
+++ b/includes/installer/MssqlUpdater.php
@@ -39,6 +39,8 @@ class MssqlUpdater extends DatabaseUpdater {
                return array(
                        // 1.23
                        array( 'addField', 'mwuser', 'user_password_expires', 'patch-user_password_expires.sql' ),
+
+                       // 1.24
                );
        }
 }

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index be1c8a7..3bc43d9 100644 (file)
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -250,6 +250,8 @@ class MysqlUpdater extends DatabaseUpdater {
                        array( 'addIndex', 'logging', 'log_user_text_time', 'patch-logging_user_text_time_index.sql' ),
                        array( 'addField', 'page', 'page_links_updated', 'patch-page_links_updated.sql' ),
                        array( 'addField', 'user', 'user_password_expires', 'patch-user_password_expire.sql' ),
+
+                       // 1.24
                        array( 'addField', 'page_props', 'pp_sortkey', 'patch-pp_sortkey.sql' ),
                );
        }

diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php
index 5e10af1..68a5519 100644 (file)
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@ -98,6 +98,8 @@ class OracleUpdater extends DatabaseUpdater {
                        array( 'addIndex', 'logging', 'i07', 'patch-logging_user_text_time_index.sql' ),
                        array( 'addField', 'user', 'user_password_expires', 'patch-user_password_expire.sql' ),
 
+                       //1.24
+
                        // KEEP THIS AT THE BOTTOM!!
                        array( 'doRebuildDuplicateFunction' ),
 

diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index 15f8160..874bbea 100644 (file)
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -128,6 +128,8 @@ class SqliteUpdater extends DatabaseUpdater {
                        array( 'addIndex', 'logging', 'log_user_text_time', 'patch-logging_user_text_time_index.sql' ),
                        array( 'addField', 'page', 'page_links_updated', 'patch-page_links_updated.sql' ),
                        array( 'addField', 'user', 'user_password_expires', 'patch-user_password_expire.sql' ),
+
+                       // 1.24
                        array( 'addField', 'page_props', 'pp_sortkey', 'patch-pp_sortkey.sql' ),
                );
        }

diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 6eee861..c2b5f9b 100644 (file)
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -259,8 +259,6 @@ class SpecialSearch extends SpecialPage {
 
                // did you mean... suggestions
                if ( $showSuggestion && $textMatches && !$textStatus && $textMatches->hasSuggestion() ) {
-                       $st = SpecialPage::getTitleFor( 'Search' );
-
                        # mirror Go/Search behavior of original request ..
                        $didYouMeanParams = array( 'search' => $textMatches->getSuggestionQuery() );
 
@@ -280,7 +278,7 @@ class SpecialSearch extends SpecialPage {
                        }
 
                        $suggestLink = Linker::linkKnown(
-                               $st,
+                               $this->getPageTitle(),
                                $suggestionSnippet,
                                array(),
                                $stParams
@@ -651,7 +649,6 @@ class SpecialSearch extends SpecialPage {
                // link to related articles if supported
                $related = '';
                if ( $result->hasRelated() ) {
-                       $st = SpecialPage::getTitleFor( 'Search' );
                        $stParams = array_merge(
                                $this->powerSearchOptions(),
                                array(
@@ -662,7 +659,7 @@ class SpecialSearch extends SpecialPage {
                        );
 
                        $related = ' -- ' . Linker::linkKnown(
-                               $st,
+                               $this->getPageTitle(),
                                $this->msg( 'search-relatedarticle' )->text(),
                                array(),
                                $stParams

diff --git a/languages/messages/MessagesCy.php b/languages/messages/MessagesCy.php
index f06b278..55ed354 100644 (file)
--- a/languages/messages/MessagesCy.php
+++ b/languages/messages/MessagesCy.php
@@ -98,7 +98,6 @@ $defaultDateFormat = 'dmy';
 
 $bookstoreList = array(
        "AddALL" => "http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN",
-       "PriceSCAN" => "http://www.pricescan.com/books/bookDetail.asp?isbn=$1",
        "Barnes & Noble" => "http://search.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1",
        "Amazon.com" => "http://www.amazon.com/exec/obidos/ISBN=$1",
        "Amazon.co.uk" => "http://www.amazon.co.uk/exec/obidos/ISBN=$1"

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 265e683..39036d7 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -189,7 +189,6 @@ $dateFormats = array(
  */
 $bookstoreList = array(
        'AddALL' => 'http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN',
-       'PriceSCAN' => 'http://www.pricescan.com/books/bookDetail.asp?isbn=$1',
        'Barnes & Noble' => 'http://search.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1',
        'Amazon.com' => 'http://www.amazon.com/gp/search/?field-isbn=$1'
 );

diff --git a/languages/messages/MessagesEt.php b/languages/messages/MessagesEt.php
index f6fda25..49c2cbc 100644 (file)
--- a/languages/messages/MessagesEt.php
+++ b/languages/messages/MessagesEt.php
@@ -143,7 +143,6 @@ $bookstoreList = array(
        'minu Raamat' => 'http://www.raamat.ee/advanced_search_result.php?keywords=$1',
        'Raamatukoi' => 'http://www.raamatukoi.ee/cgi-bin/index?valik=otsing&paring=$1',
        'AddALL' => 'http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN',
-       'PriceSCAN' => 'http://www.pricescan.com/books/bookDetail.asp?isbn=$1',
        'Barnes & Noble' => 'http://search.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1',
        'Amazon.com' => 'http://www.amazon.com/exec/obidos/ISBN=$1'
 );

diff --git a/languages/messages/MessagesId.php b/languages/messages/MessagesId.php
index 773d3a2..48507d4 100644 (file)
--- a/languages/messages/MessagesId.php
+++ b/languages/messages/MessagesId.php
@@ -48,7 +48,6 @@ $bookstoreList = array(
        'Barnes & Noble' => 'http://search.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1',
        'Bhinneka.com bookstore' => 'http://www.bhinneka.com/Buku/Engine/search.asp?fisbn=$1',
        'Gramedia Cyberstore (via Google)' => 'http://www.google.com/search?q=%22ISBN+:+$1%22+%22product_detail%22+site:www.gramediacyberstore.com+OR+site:www.gramediaonline.com+OR+site:www.kompas.com&hl=id',
-       'PriceSCAN' => 'http://www.pricescan.com/books/bookDetail.asp?isbn=$1',
 );
 
 $magicWords = array(

diff --git a/languages/messages/MessagesTyv.php b/languages/messages/MessagesTyv.php
index a13055b..de694e4 100644 (file)
--- a/languages/messages/MessagesTyv.php
+++ b/languages/messages/MessagesTyv.php
@@ -101,7 +101,6 @@ $bookstoreList = array(
        'Яндекс.Маркет' => 'http://market.yandex.ru/search.xml?text=$1',
        'Amazon.com' => 'http://www.amazon.com/exec/obidos/ISBN=$1',
        'AddALL' => 'http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN',
-       'PriceSCAN' => 'http://www.pricescan.com/books/bookDetail.asp?isbn=$1',
        'Barnes & Noble' => 'http://shop.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1'
 );
 

diff --git a/languages/messages/MessagesYue.php b/languages/messages/MessagesYue.php
index c4394d2..96f640c 100644 (file)
--- a/languages/messages/MessagesYue.php
+++ b/languages/messages/MessagesYue.php
@@ -193,7 +193,6 @@ $specialPageAliases = array(
 
 $bookstoreList = array(
        'AddALL' => 'http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN',
-       'PriceSCAN' => 'http://www.pricescan.com/books/bookDetail.asp?isbn=$1',
        'Barnes & Noble' => 'http://search.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1',
        '亞馬遜' => 'http://www.amazon.com/exec/obidos/ISBN=$1',
        '博客來書店' => 'http://www.books.com.tw/exep/prod/booksfile.php?item=$1',

diff --git a/languages/messages/MessagesZh_hans.php b/languages/messages/MessagesZh_hans.php
index 7f02fe7..b6606f6 100644 (file)
--- a/languages/messages/MessagesZh_hans.php
+++ b/languages/messages/MessagesZh_hans.php
@@ -373,7 +373,6 @@ $dateFormats = array(
 
 $bookstoreList = array(
        'AddALL' => 'http://www.addall.com/New/Partner.cgi?query=$1&type=ISBN',
-       'PriceSCAN' => 'http://www.pricescan.com/books/bookDetail.asp?isbn=$1',
        'Barnes & Noble' => 'http://search.barnesandnoble.com/bookSearch/isbnInquiry.asp?isbn=$1',
        '亚马逊' => 'http://www.amazon.com/exec/obidos/ISBN=$1',
        '卓越亚马逊' => 'http://www.amazon.cn/mn/advancedSearchApp?isbn=$1',