aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authortommy tomson <thomas.bierey@gmx.de>2012-03-02 04:58:37 +0100
committertommy tomson <thomas.bierey@gmx.de>2012-03-02 04:58:37 +0100
commit1fac47a2470c392adc2f5a2201f618a804be5136 (patch)
tree0fc2c1a194989fab1948a2dff7f0e46af6facaa3 /include
parent5183e737d0cb53aa9f380051ca130d010893009f (diff)
parent8207272fbc9cdc76988a2848552528e28951fe27 (diff)
downloadvolse-hubzilla-1fac47a2470c392adc2f5a2201f618a804be5136.tar.gz
volse-hubzilla-1fac47a2470c392adc2f5a2201f618a804be5136.tar.bz2
volse-hubzilla-1fac47a2470c392adc2f5a2201f618a804be5136.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include')
-rwxr-xr-xinclude/Scrape.php5
-rwxr-xr-xinclude/acl_selectors.php7
2 files changed, 11 insertions, 1 deletions
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 {
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();