From 755c2245e8184ceee2ba3382e4f60143da31e6df Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 23 Feb 2011 15:16:12 -0800
Subject: move php path setting inside proc_run

---
 include/poller.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/poller.php b/include/poller.php
index 66df080a9..d54c88e05 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -27,8 +27,7 @@ function poller_run($argv, $argc){
 	
 	// run queue delivery process in the background
 
-	$php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-	proc_run($php_path,"include/queue.php");
+	proc_run('php',"include/queue.php");
 	
 	// clear old cache
 	q("DELETE FROM `cache` WHERE `updated`<'%s'",
-- 
cgit v1.2.3


From 8ed085c64e4fb097394d0cc93f8744606c15527b Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 24 Feb 2011 03:48:21 -0800
Subject: don't truncate names across multi-byte char sequences

---
 include/acl_selectors.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/acl_selectors.php b/include/acl_selectors.php
index 94f51a9ff..9467531d9 100644
--- a/include/acl_selectors.php
+++ b/include/acl_selectors.php
@@ -26,7 +26,7 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) {
 				$selected = " selected=\"selected\" ";
 			else
 				$selected = '';
-			$trimmed = substr($rr['name'],0,12);
+			$trimmed = mb_substr($rr['name'],0,12);
 
 			$o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}\" >$trimmed</option>\r\n";
 		}
@@ -89,7 +89,7 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p
 			else
 				$selected = '';
 
-			$trimmed = substr($rr['name'],0,22);
+			$trimmed = mb_substr($rr['name'],0,22);
 
 			$o .= "<option value=\"{$rr['id']}\" $selected title=\"{$rr['name']}|{$rr['url']}\" >$trimmed</option>\r\n";
 		}
-- 
cgit v1.2.3