From a1ba44db720abab58d8b6b13035daa25710acd03 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Tue, 16 May 2017 22:57:34 -0700
Subject: provide mechanism to arbitrarily sort the nav tray apps, currently
 the preferred order list needs to be manually created

---
 include/nav.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'include')

diff --git a/include/nav.php b/include/nav.php
index 849e19d9a..0fd555abf 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -257,6 +257,8 @@ EOT;
 
 	usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare');
 
+	$syslist = Zlib\Apps::app_order(local_channel(),$syslist);
+
 	foreach($syslist as $app) {
 		$nav_apps[] = Zlib\Apps::app_render($app,'nav');
 	}
-- 
cgit v1.2.3


From a44c908147572646e84620a32e4ad6bf316d7147 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 17 May 2017 11:24:27 +0200
Subject: silence php warning during install

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

(limited to 'include')

diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php
index ad1d9d194..d362f58b2 100755
--- a/include/dba/dba_driver.php
+++ b/include/dba/dba_driver.php
@@ -452,7 +452,7 @@ function db_getfunc($f) {
 
 function db_logger($s,$level = LOGGER_NORMAL,$syslog = LOG_INFO) {
 
-	if(\DBA::$logging)
+	if(\DBA::$logging || ! \DBA::$dba)
 		return;
 
 	$saved = \DBA::$dba->debug;
-- 
cgit v1.2.3


From b62463107ce89f397aa0bd738f10cb0522bb126e Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Fri, 19 May 2017 10:47:33 +0200
Subject: smileybutton fixes

---
 include/text.php | 2 --
 1 file changed, 2 deletions(-)

(limited to 'include')

diff --git a/include/text.php b/include/text.php
index 162d7c365..d352a61bf 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1171,7 +1171,6 @@ function list_smilies($default_only = false) {
 	$texts =  array(
 		'&lt;3',
 		'&lt;/3',
-		'&lt;\\3',
 		':-)',
 		';-)',
 		':-(',
@@ -1207,7 +1206,6 @@ function list_smilies($default_only = false) {
 	$icons = array(
 		'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-heart.gif" alt="&lt;3" />',
 		'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-brokenheart.gif" alt="&lt;/3" />',
-		'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-brokenheart.gif" alt="&lt;\\3" />',
 		'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-smile.gif" alt=":-)" />',
 		'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-wink.gif" alt=";-)" />',
 		'<img class="smiley" src="' . z_root() . '/images/emoticons/smiley-frown.gif" alt=":-(" />',
-- 
cgit v1.2.3