| Index: trunk/phase3/includes/search/SearchEngine.php |
| — | — | @@ -63,7 +63,7 @@ |
| 64 | 64 | * @return Title |
| 65 | 65 | */ |
| 66 | 66 | public static function getNearMatch( $searchterm ) { |
| 67 | | - global $wgContLang, $wgSecondaryGoNamespaces; |
| | 67 | + global $wgContLang; |
| 68 | 68 | |
| 69 | 69 | $allSearchTerms = array($searchterm); |
| 70 | 70 | |
| — | — | @@ -88,14 +88,6 @@ |
| 89 | 89 | return $title; |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | | - # If a match is not found in the main namespace look in secondary go namespaces. |
| 93 | | - if( $wgSecondaryGoNamespaces && $title->getNamespace() == NS_MAIN ) { |
| 94 | | - foreach( $wgSecondaryGoNamespaces as $ns ) { |
| 95 | | - $title = Title::newFromText( $term, $ns ); |
| 96 | | - if( $title && $title->exists() ) return $title; |
| 97 | | - } |
| 98 | | - } |
| 99 | | - |
| 100 | 92 | # Now try all lower case (i.e. first letter capitalized) |
| 101 | 93 | # |
| 102 | 94 | $title = Title::newFromText( $wgContLang->lc( $term ) ); |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -4128,15 +4128,7 @@ |
| 4129 | 4129 | */ |
| 4130 | 4130 | $wgAllowPrefChange = array(); |
| 4131 | 4131 | |
| 4132 | | -/** |
| 4133 | | - * If an exact match is not found, try to find a match in different namespaces |
| 4134 | | - * before performing a search. |
| 4135 | | - * |
| 4136 | | - * Array: Ids of namespaces to attempt match in, in desired order. |
| 4137 | | - */ |
| 4138 | | -$wgSecondaryGoNamespaces = null; |
| 4139 | 4132 | |
| 4140 | | - |
| 4141 | 4133 | /** |
| 4142 | 4134 | * Settings for incoming cross-site AJAX requests: |
| 4143 | 4135 | * Newer browsers support cross-site AJAX when the target resource allows requests |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -73,8 +73,6 @@ |
| 74 | 74 | to same server |
| 75 | 75 | * $wgSpecialVersionExtended shows the extended version information besides |
| 76 | 76 | PHP and database version. |
| 77 | | -* $wgSecondaryGoNamespaces allows an arry of namespaces to be checked when the |
| 78 | | - GO button is pressed, in addition to the main namespace. |
| 79 | 77 | * (bug 19907) $wgCrossSiteAJAXdomains and $wgCrossSiteAJAXdomainExceptions added |
| 80 | 78 | to control which external domains may access the API via cross-site AJAX. |
| 81 | 79 | * $wgMaintenanceScripts for extensions to add their scripts to the default list |
| — | — | @@ -156,8 +154,6 @@ |
| 157 | 155 | * (bug 14201) Set $wgDBadminuser/$wgDBadminpassword during setup |
| 158 | 156 | * (bug 18768) Remove AdminSettings requirements. Maintenance environment |
| 159 | 157 | will still load it if it exists, but it's not required for anything |
| 160 | | -* Added $wgSecondaryGoNamespaces, allowing an array of namespaces to be checked |
| 161 | | - when the Go button is pressed in addition to the main namespace. |
| 162 | 158 | * (bug 19900) The "listgrouprights-key" message is now wrapped in a div with |
| 163 | 159 | class "mw-listgrouprights-key" |
| 164 | 160 | * (bug 471) Allow RSS feeds for watchlist, using an opt-in security token |