From 755c2245e8184ceee2ba3382e4f60143da31e6df Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 23 Feb 2011 15:16:12 -0800 Subject: move php path setting inside proc_run --- boot.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 530baa7b9..d9786edcd 100644 --- a/boot.php +++ b/boot.php @@ -2434,6 +2434,9 @@ if(! function_exists('proc_run')) { function proc_run($cmd){ $args = func_get_args(); call_hooks("proc_run", $args); + + if(count($args) && $args[0] === 'php') + $args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); foreach ($args as $arg){ $arg = escapeshellarg($arg); -- cgit v1.2.3 From 15780914eca543bf14dbf211bcbf7d18e3553639 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 23 Feb 2011 19:30:57 -0800 Subject: another template made language neutral --- boot.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'boot.php') diff --git a/boot.php b/boot.php index d9786edcd..8de891f38 100644 --- a/boot.php +++ b/boot.php @@ -768,7 +768,12 @@ function escape_tags($string) { if(! function_exists('login')) { function login($register = false) { $o = ""; - $register_html = (($register) ? load_view_file("view/register-link.tpl") : ""); + $register_tpl = (($register) ? load_view_file("view/register-link.tpl") : ""); + + $register_html = replace_macros($register_tpl,array( + '$title' => t('Create a New Account'), + '$desc' => t('Register') + )); $noid = get_config('system','no_openid'); if($noid) { -- cgit v1.2.3 From a247a3cedb6a137d76fa7daa70d58ca91f17ff04 Mon Sep 17 00:00:00 2001 From: Friendika Date: Wed, 23 Feb 2011 20:43:22 -0800 Subject: another template down --- boot.php | 1 + 1 file changed, 1 insertion(+) (limited to 'boot.php') diff --git a/boot.php b/boot.php index 8de891f38..dc92d8dbb 100644 --- a/boot.php +++ b/boot.php @@ -800,6 +800,7 @@ function login($register = false) { } $o = replace_macros($tpl,array( + '$logout' => t('Logout'), '$register_html' => $register_html, '$classname' => $classname, '$namelabel' => $namelabel, -- cgit v1.2.3