From 4cb2c55025c2ca56034117629af4d26856b9c7e8 Mon Sep 17 00:00:00 2001
From: Joakim <joakim@my domain name here.com>
Date: Fri, 5 Jul 2013 20:34:38 +0200
Subject: Filter test from web interface now replicates behaviour from pull
 #167

---
 include/functions.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 355eec2cd..0eceed623 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -3958,6 +3958,7 @@
 			$reg_qpart = "REGEXP";
 
 		foreach ($filter["rules"] AS $rule) {
+			$rule['reg_exp'] = str_replace('/', '\/', $rule["reg_exp"]);
 			$regexp_valid = preg_match('/' . $rule['reg_exp'] . '/',
 				$rule['reg_exp']) !== FALSE;
 
-- 
cgit v1.2.3-54-g00ecf


From c722c0be1788c99f54782cb44295bfd4a3085bad Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sun, 7 Jul 2013 11:23:59 +0400
Subject: rewrite_relative_url: don't touch stuff which has sheme in it (closes
 #738)

---
 include/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'include/functions.php')

diff --git a/include/functions.php b/include/functions.php
index 0eceed623..bcded7e5f 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -3788,7 +3788,7 @@
 	 * @return string Absolute URL
 	 */
 	function rewrite_relative_url($url, $rel_url) {
-		if (strpos($rel_url, "magnet:") === 0) {
+		if (strpos($rel_url, ":") !== false) {
 			return $rel_url;
 		} else if (strpos($rel_url, "://") !== false) {
 			return $rel_url;
-- 
cgit v1.2.3-54-g00ecf


From 47fecba235400e0d7a5a7c54c9ff201c0840deec Mon Sep 17 00:00:00 2001
From: justauser <justausr@hotmail.com>
Date: Sun, 7 Jul 2013 13:53:23 -0400
Subject: changes to add hook_query_headlines

---
 classes/pluginhost.php           |  1 +
 include/functions.php            |  2 +-
 plugins/query_headlines/init.js  |  0
 plugins/query_headlines/init.php | 50 ++++++++++++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 plugins/query_headlines/init.js
 create mode 100644 plugins/query_headlines/init.php

(limited to 'include/functions.php')

diff --git a/classes/pluginhost.php b/classes/pluginhost.php
index 53adf01f9..a1bd1b364 100644
--- a/classes/pluginhost.php
+++ b/classes/pluginhost.php
@@ -37,6 +37,7 @@ class PluginHost {
 	const HOOK_PREFS_EDIT_FEED = 20;
 	const HOOK_PREFS_SAVE_FEED = 21;
 	const HOOK_FETCH_FEED = 22;
+	const HOOK_QUERY_HEADLINES = 23;
 
 	const KIND_ALL = 1;
 	const KIND_SYSTEM = 2;
diff --git a/include/functions.php b/include/functions.php
index 355eec2cd..397605c5a 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -2579,7 +2579,7 @@
 				}
 			}
 
-			$content_query_part = "content as content_preview, cached_content, ";
+			$content_query_part = "content, content as content_preview, cached_content, ";
 
 			if (is_numeric($feed)) {
 
diff --git a/plugins/query_headlines/init.js b/plugins/query_headlines/init.js
new file mode 100644
index 000000000..e69de29bb
diff --git a/plugins/query_headlines/init.php b/plugins/query_headlines/init.php
new file mode 100644
index 000000000..5d71d0356
--- /dev/null
+++ b/plugins/query_headlines/init.php
@@ -0,0 +1,50 @@
+<?php
+class Query_Headlines extends Plugin {
+	// example of the use of the HOOK_QUERY_HEADLINES
+	// this example will change the author and tags to be empty string so they don't display
+	// the arguements are:
+	//	-	 the array of elements that are returned by queryFeedHeadlines
+	// 	-	the length that the caller wants to truncate the content preview to
+	//	-	a boolean that indicates if the caller is from an API call
+	// The field content_preview has been shortened and sanitized, as appropriate
+	// before the plugin is called.  If you want to do your own preview handling
+	// use the content field and create the preview from that
+	//NOTE:****  You have to make this a system plugin if you want it to also work
+	//		on API calls.  If you just make it a user plugin it will work on web page output
+	//		but not on API calls
+	private $host;
+
+	function about() {
+		return array(1.0,
+			"Example of use of HOOK_QUERY_HEADLINES",
+			"justauser" );
+	}
+
+	function init($host) {
+		$this->host = $host;
+		$host->add_hook($host::HOOK_QUERY_HEADLINES, $this);
+	}
+
+	// passes in the array for an item
+	// second argument is the length of the preview the caller is using
+	// create a key called "modified_preview" if you change the preview and don't want
+	//		caller to override with their default
+
+	function hook_query_headlines($line, $preview_length = 100,$api_call=false) {
+		//make the author field empty
+		$line["author"] = "";
+		
+		// and toss tags, since I don't use
+		$line["tag_cache"] = "";
+		return $line;
+		
+		
+	}
+	
+
+	function api_version() {
+		return 2;
+	}
+
+}
+?>
-- 
cgit v1.2.3-54-g00ecf