aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-05-25 00:43:09 -0700
committerfriendica <info@friendica.com>2012-05-25 00:43:09 -0700
commitd1345e505406b1a1cdc3fc26a1734916c8abc89d (patch)
tree93416482d64d3ad9f275986ce0d39c2024520d00 /mod
parentabb9fecf0954e883f19b3cf16279dfa2d8c20271 (diff)
parent07535692dc0f8bb366dcaa689cee3e5bdcd470bf (diff)
downloadvolse-hubzilla-d1345e505406b1a1cdc3fc26a1734916c8abc89d.tar.gz
volse-hubzilla-d1345e505406b1a1cdc3fc26a1734916c8abc89d.tar.bz2
volse-hubzilla-d1345e505406b1a1cdc3fc26a1734916c8abc89d.zip
Merge https://github.com/friendica/friendica into pull
Diffstat (limited to 'mod')
-rw-r--r--mod/install.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/mod/install.php b/mod/install.php
index 1bdb792a9..6d6232a95 100644
--- a/mod/install.php
+++ b/mod/install.php
@@ -315,14 +315,16 @@ function check_php(&$phpath, &$checks) {
$help = "";
if(!$passed) {
$help .= t('Could not find a command line version of PHP in the web server PATH.'). EOL;
+ $help .= t("If you don't have a command line version of PHP installed on server, you will not be able to run background polling via cron. See <a href='http://friendica.com/node/27'>'Activating scheduled tasks'</a>") . EOL ;
+ $help .= EOL . EOL ;
$tpl = get_markup_template('field_input.tpl');
$help .= replace_macros($tpl, array(
- '$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable')),
+ '$field' => array('phpath', t('PHP executable path'), $phpath, t('Enter full path to php executable. You can leave this blank to continue the installation.')),
));
$phpath="";
}
- check_add($checks, t('Command line PHP'), $passed, true, $help);
+ check_add($checks, t('Command line PHP').($passed?" (<tt>$phpath</tt>)":""), $passed, false, $help);
if($passed) {
$str = autoname(8);