From e0c659b34b8992111bcc64d3f0eea75dfa193412 Mon Sep 17 00:00:00 2001
From: Alexander Kampmann <programmer@nurfuerspam.de>
Date: Thu, 1 Mar 2012 11:44:33 +0100
Subject: Enabled automated doc building. Changes: -build.xml, phing build file
 -@package tags at acl_selector.php and db_update.php -added documentation and
 some IDE files to .gitignore -automated tool to find files that corrupt the
 doc build process -removed ansi characters from SSH1.php, docBlox could not
 handle them

---
 include/acl_selectors.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'include')

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 6070b7db2..67d8cebde 100755
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -1,6 +1,11 @@
 <?php
+/**
+ * 
+ */
 
-
+/**
+ * @package acl_selectors 
+ */
 function group_select($selname,$selclass,$preselected = false,$size = 4) {
 
 	$a = get_app();
-- 
cgit v1.2.3


From 58e3372b23b286334e5195b1b8f70448715ed493 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 1 Mar 2012 18:49:23 -0800
Subject: probe for very old (0.97 or 1.0) RSS feed with an incorrect or
 generic content-type

---
 include/Scrape.php | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'include')

diff --git a/include/Scrape.php b/include/Scrape.php
index 4c4ad3cdb..8344aa737 100755
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -255,6 +255,11 @@ function scrape_feed($url) {
 				}
 			}
 		}
+		// perhaps an RSS version 1 feed with a generic or incorrect content-type?
+		if(stristr($s,'</item>')) {
+			$ret['feed_rss'] = $url;
+			return $ret;
+		}
 	}
 
 	try {
-- 
cgit v1.2.3