From b6267ec7c2e5d820c900603fcba5bf46cf2e5f90 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 29 May 2019 17:04:27 -0700
Subject: live-update not triggering on mod_search

---
 Zotlabs/Module/Search.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index 838f9d6b9..214ece9a3 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -38,8 +38,8 @@ class Search extends \Zotlabs\Web\Controller {
 		$observer_hash = (($observer) ? $observer['xchan_hash'] : '');
 	
 		$o = '<div id="live-search"></div>' . "\r\n";
-	
-	        $o = '<div class="generic-content-wrapper-styled">' . "\r\n";
+
+		$o .= '<div class="generic-content-wrapper-styled">' . "\r\n";
 	
 		$o .= '<h3>' . t('Search') . '</h3>';
 	
-- 
cgit v1.2.3


From a8e25ccfe6a00c2b25eb75f0b20a1d854adcecb9 Mon Sep 17 00:00:00 2001
From: Max Kostikov <max@kostikov.co>
Date: Thu, 30 May 2019 13:41:32 +0200
Subject: Add single photo URL rewrite for clonned channel

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

diff --git a/include/text.php b/include/text.php
index 6a2a9e427..a2dfda952 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3091,7 +3091,7 @@ function item_url_replace($channel,&$item,$old,$new,$oldnick = '') {
 			json_url_replace('/' . $oldnick . '/' ,'/' . $channel['channel_address'] . '/' ,$item['target']);
 	}
 	
-	$item['body'] = preg_replace("/(\[zrl=".preg_quote($old,'/')."\/(photos|gallery)\/".$channel['channel_address'].".+\]\[zmg=\d+x\d+\])".preg_quote($old,'/')."\/(.+\[\/zmg\])/", '${1}'.$new.'/${3}', $item['body']);
+	$item['body'] = preg_replace("/(\[zrl=".preg_quote($old,'/')."\/(photo|photos|gallery)\/".$channel['channel_address'].".+\]\[zmg=\d+x\d+\])".preg_quote($old,'/')."\/(.+\[\/zmg\])/", '${1}'.$new.'/${3}', $item['body']);
 	$item['body'] = preg_replace("/".preg_quote($old,'/')."\/(search|\w+\/".$channel['channel_address'].")/", $new.'/${1}', $item['body']);
 
 	$item['sig'] = base64url_encode(rsa_sign($item['body'],$channel['channel_prvkey']));
-- 
cgit v1.2.3


From c7476a1d96aac832adca9dcf559d4bc7ccc0a5a0 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Fri, 31 May 2019 14:19:04 -0700
Subject: fix category widget when using articles

---
 Zotlabs/Widget/Categories.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Zotlabs/Widget/Categories.php b/Zotlabs/Widget/Categories.php
index 27d4b5980..82c37cd0c 100644
--- a/Zotlabs/Widget/Categories.php
+++ b/Zotlabs/Widget/Categories.php
@@ -18,10 +18,9 @@ class Categories {
 
 		$articles = ((array_key_exists('articles',$arr) && $arr['articles']) ? true : false);
 
-		if(($articles) && (! feature_enabled(App::$profile['profile_uid'],'articles')))
+		if(($articles) && (! Apps::system_app_installed(App::$profile['profile_uid'],'Articles')))
 			return '';
 
-
 		if((! App::$profile['profile_uid']) 
 			|| (! perm_is_allowed(App::$profile['profile_uid'],get_observer_hash(),(($cards || $articles) ? 'view_pages' : 'view_stream')))) {
 			return '';
-- 
cgit v1.2.3