Wikinaut has submitted this change and it was merged.

Change subject: trim white spaces around urls in feed item <link> or <id> tags
......................................................................


trim white spaces around urls in feed item <link> or <id> tags

Change-Id: I2a8098cb5f0f8b01bf6b82f850bcbdfd8597be2d
---
M RELEASE-NOTES
M RSS.php
M RSSParser.php
3 files changed, 7 insertions(+), 4 deletions(-)

Approvals:
  Parent5446: Looks good to me, approved
  Wikinaut: Verified; Looks good to me, approved
  jenkins-bot: Checked



diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 15f3ca3..9b9142a 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,6 +1,6 @@
 RELEASE NOTES of the MediaWiki extension RSS
 
-Version 2.21 20130415
+Version 2.22 20130609
 
 Manual http://www.mediawiki.org/wiki/Extension:RSS
 
@@ -27,6 +27,9 @@
   The length limitation must be HTML tag-safe, but it is not at the moment.
   Length limitation is disabled by default.
 
+=== Version 2.22 2013-06-09 ==
+* removing white spaces aroung urls in feed item <link> or <id> tags
+
 === Version 2.21 2013-04-15 ==
 * (bug 47251) fix of an XXE problem
 
diff --git a/RSS.php b/RSS.php
index 238634a..a70299b 100644
--- a/RSS.php
+++ b/RSS.php
@@ -4,7 +4,7 @@
  *
  * @file
  * @ingroup Extensions
- * @version 2.20
+ * @version 2.22
  * @author mutante, Daniel Kinzler, Rdb, Mafs, Thomas Gries, Alxndr, Chris 
Reigrut, K001
  * @author Kellan Elliott-McCrea <[email protected]> -- author of MagpieRSS
  * @author Jeroen De Dauw
@@ -14,7 +14,7 @@
  * @link http://www.mediawiki.org/wiki/Extension:RSS Documentation
  */
 
-define( "EXTENSION_RSS_VERSION", "2.21 20130415" );
+define( "EXTENSION_RSS_VERSION", "2.22" );
 
 if ( !defined( 'MEDIAWIKI' ) ) {
        die( "This is not a valid entry point.\n" );
diff --git a/RSSParser.php b/RSSParser.php
index edbfe1a..46fab3c 100644
--- a/RSSParser.php
+++ b/RSSParser.php
@@ -399,7 +399,7 @@
         */
        protected function sanitizeUrl( $url ) {
                # Remove control characters
-               $url = preg_replace( '/[\000-\037\177]/', '', $url );
+               $url = preg_replace( '/[\000-\037\177]/', '', trim( $url ) );
                # Escape other problematic characters
                $out = '';
                for ( $i = 0; $i < strlen( $url ); $i++ ) {

-- 
To view, visit https://gerrit.wikimedia.org/r/67628
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I2a8098cb5f0f8b01bf6b82f850bcbdfd8597be2d
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/RSS
Gerrit-Branch: master
Gerrit-Owner: Wikinaut <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Wikinaut <[email protected]>
Gerrit-Reviewer: jenkins-bot

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to