From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 2 Aug 2013 10:47:34 +0000 (+0400)
Subject: rss: force language to 2 characters; run house keeping hooks properly
X-Git-Tag: 1.10~36
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=00f22824d7add7c49713e48f936bcb804c3741f6;p=tt-rss.git

rss: force language to 2 characters; run house keeping hooks properly
---

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index e6866182..65855754 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -574,7 +574,7 @@
 
 				if (count($entry_language) > 0) {
 					$entry_language = array_keys($entry_language);
-					$entry_language = db_escape_string($entry_language[0]);
+					$entry_language = db_escape_string(substr($entry_language[0], 0, 2));
 
 					_debug("detected language: $entry_language", $debug_enabled);
 				}
@@ -1379,9 +1379,7 @@
 
 		_debug("Cleaned $rc cached tags.");
 
-		foreach ($pluginhost->get_hooks(PluginHost::HOOK_HOUSE_KEEPING) as $plugin) {
-			$plugin->hook_house_keeping();
-		}
+		PluginHost::getInstance()->run_hooks(PluginHost::HOOK_HOUSE_KEEPING, "hook_house_keeping", "");
 
 	}
 ?>