aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/acl_selectors.php4
-rw-r--r--include/poller.php3
2 files changed, 3 insertions, 4 deletions
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";
}
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'",