From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sun, 28 Oct 2012 09:02:50 +0000 (+0400)
Subject: fix ARTICLE_BUTTON_PLUGINS not loaded when string contains spaces
X-Git-Tag: 1.6.1~47
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=8b299a163ec042d4d82cbf627675941bf330c889;p=tt-rss.git

fix ARTICLE_BUTTON_PLUGINS not loaded when string contains spaces
---

diff --git a/classes/feeds.php b/classes/feeds.php
index d924eeb3..d13c83a2 100644
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -248,7 +248,7 @@ class Feeds extends Handler_Protected {
 		if (get_pref($this->link, 'COMBINED_DISPLAY_MODE')) {
 			$button_plugins = array();
 			foreach (explode(",", ARTICLE_BUTTON_PLUGINS) as $p) {
-				$pclass = trim("button_${p}");
+				$pclass = "button_" . trim($p);
 
 				if (class_exists($pclass)) {
 					$plugin = new $pclass($link);
diff --git a/include/functions.php b/include/functions.php
index eeed5650..2994dd43 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -3434,7 +3434,7 @@
 				$button_plugins = explode(",", ARTICLE_BUTTON_PLUGINS);
 
 				foreach ($button_plugins as $p) {
-					$pclass = trim("button_${p}");
+					$pclass = "button_" . trim($p);
 
 					if (class_exists($pclass)) {
 						$plugin = new $pclass($link);