[Pkg-mediawiki-commits] r218 - in mediawiki/exp-1.16/debian: . patches

[Jonathan Wiltshire]

Author: jmw-guest
Date: 2010-07-28 21:35:47 +0000 (Wed, 28 Jul 2010)
New Revision: 218

Removed:
   mediawiki/exp-1.16/debian/patches/add_rss_guid.patch
Modified:
   mediawiki/exp-1.16/debian/changelog
   mediawiki/exp-1.16/debian/patches/series
Log:
add_rss_guid.patch now integrated upstream

Modified: mediawiki/exp-1.16/debian/changelog
===================================================================
--- mediawiki/exp-1.16/debian/changelog	2010-07-28 21:34:51 UTC (rev 217)
+++ mediawiki/exp-1.16/debian/changelog	2010-07-28 21:35:47 UTC (rev 218)
@@ -3,8 +3,9 @@
   * New upstream release
   * Refactor patches
     - detect_invalid_titles.patch integrated upstream
+    - add_rss_guid.patch integrated upstream
 
- -- Jonathan Wiltshire <debian at jwiltshire.org.uk>  Wed, 28 Jul 2010 22:34:10 +0100
+ -- Jonathan Wiltshire <debian at jwiltshire.org.uk>  Wed, 28 Jul 2010 22:35:21 +0100
 
 mediawiki (1:1.15.5-1) unstable; urgency=high
 

Deleted: mediawiki/exp-1.16/debian/patches/add_rss_guid.patch
===================================================================
--- mediawiki/exp-1.16/debian/patches/add_rss_guid.patch	2010-07-28 21:34:51 UTC (rev 217)
+++ mediawiki/exp-1.16/debian/patches/add_rss_guid.patch	2010-07-28 21:35:47 UTC (rev 218)
@@ -1,77 +0,0 @@
-Index: mediawiki-1.15.2/includes/Feed.php
-===================================================================
---- mediawiki-1.15.2.orig/includes/Feed.php	2008-11-18 18:11:14.000000000 -0600
-+++ mediawiki-1.15.2/includes/Feed.php	2010-03-15 12:16:49.000000000 -0500
-@@ -37,6 +37,8 @@
- 	var $Url = '';
- 	var $Date = '';
- 	var $Author = '';
-+	var $UniqueId = '';
-+	var $RSSIsPermalink;
- 	/**#@-*/
- 
- 	/**#@+
-@@ -47,6 +49,8 @@
- 		$this->Title = $Title;
- 		$this->Description = $Description;
- 		$this->Url = $Url;
-+		$this->UniqueId = $Url;
-+		$this->RSSIsPermalink = false;
- 		$this->Date = $Date;
- 		$this->Author = $Author;
- 		$this->Comments = $Comments;
-@@ -58,6 +62,28 @@
- 		return htmlspecialchars( $string );
- 	}
- 
-+	/**
-+	 * Get the unique id of this item
-+	 *
-+	 * @return String
-+	 */
-+	public function getUniqueId() {
-+		if ( $this->UniqueId ) {
-+			return $this->xmlEncode( $this->UniqueId );
-+		}
-+	}
-+
-+	/**
-+	 * set the unique id of an item
-+	 *
-+	 * @param $uniqueId String: unique id for the item
-+	 * @param $RSSisPermalink Boolean: set to true if the guid (unique id) is a permalink (RSS feeds only)
-+	 */
-+	public function setUniqueId($uniqueId, $RSSisPermalink = False) {
-+		$this->UniqueId = $uniqueId;
-+		$this->RSSIsPermalink = $isPermalink;
-+	}
-+
- 	public function getTitle() {
- 		return $this->xmlEncode( $this->Title );
- 	}
-@@ -84,7 +110,7 @@
- 	public function getComments() {
- 		return $this->xmlEncode( $this->Comments );
- 	}
--	
-+
- 	/**
- 	 * Quickie hack... strip out wikilinks to more legible form from the comment.
- 	 */
-@@ -217,6 +243,7 @@
- 		<item>
- 			<title><?php print $item->getTitle() ?></title>
- 			<link><?php print $item->getUrl() ?></link>
-+			<guid<?php if( $item->RSSIsPermalink ) print ' isPermaLink="true"' ?>><?php print $item->getUniqueId() ?></guid>
- 			<description><?php print $item->getDescription() ?></description>
- 			<?php if( $item->getDate() ) { ?><pubDate><?php print $this->formatTime( $item->getDate() ) ?></pubDate><?php } ?>
- 			<?php if( $item->getAuthor() ) { ?><dc:creator><?php print $item->getAuthor() ?></dc:creator><?php }?>
-@@ -297,7 +324,7 @@
- 		global $wgMimeType;
- 	?>
- 	<entry>
--		<id><?php print $item->getUrl() ?></id>
-+		<id><?php print $item->getUniqueId() ?></id>
- 		<title><?php print $item->getTitle() ?></title>
- 		<link rel="alternate" type="<?php print $wgMimeType ?>" href="<?php print $item->getUrl() ?>"/>
- 		<?php if( $item->getDate() ) { ?>

Modified: mediawiki/exp-1.16/debian/patches/series
===================================================================
--- mediawiki/exp-1.16/debian/patches/series	2010-07-28 21:34:51 UTC (rev 217)
+++ mediawiki/exp-1.16/debian/patches/series	2010-07-28 21:35:47 UTC (rev 218)
@@ -1,6 +1,5 @@
 texvc_location.patch
 mimetypes.patch
 debian_specific_config.patch
-#add_rss_guid.patch
 backup_documentation.patch
 suppress_warnings.patch