Revision: 46295
Author: brion
Date: 2009-01-26 22:57:59 +0000 (Mon, 26 Jan 2009)
Log Message:
-----------
Reverting r46131 "OpenSearchXml extension: (bug 17142) action=opensearch
shouldn't resolve redirects in XML mode"
Major regression in attractiveness and usability; the feature that was removed
was not a bug.
Modified Paths:
--------------
trunk/extensions/OpenSearchXml/ApiOpenSearchXml.php
Modified: trunk/extensions/OpenSearchXml/ApiOpenSearchXml.php
===================================================================
--- trunk/extensions/OpenSearchXml/ApiOpenSearchXml.php 2009-01-26 22:32:11 UTC
(rev 46294)
+++ trunk/extensions/OpenSearchXml/ApiOpenSearchXml.php 2009-01-26 22:57:59 UTC
(rev 46295)
@@ -89,8 +89,9 @@
}
protected function formatItem( $name ) {
- $title = Title::newFromText( $name );
+ $title = TItle::newFromText( $name );
if( $title ) {
+ $title = $this->_checkRedirect( $title );
if( $this->_seen( $title ) ) {
return false;
}
@@ -115,6 +116,16 @@
return $item;
}
+ protected function _checkRedirect( $title ) {
+ $art = new Article( $title );
+ $target = $art->getRedirectTarget();
+ if( $target ) {
+ return $target;
+ } else {
+ return $title;
+ }
+ }
+
protected function _seen( $title ) {
$name = $title->getPrefixedText();
if( isset( $this->mSeen[$name] ) ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
