diff options
Diffstat (limited to 'install')
| -rw-r--r-- | install/INSTALL.txt | 6 | ||||
| -rwxr-xr-x | install/htconfig.sample.php | 20 |
2 files changed, 13 insertions, 13 deletions
diff --git a/install/INSTALL.txt b/install/INSTALL.txt index 1d3811501..18cf4a1db 100644 --- a/install/INSTALL.txt +++ b/install/INSTALL.txt @@ -220,11 +220,11 @@ You can generally find the location of PHP by executing "which php". If you have troubles with this section please contact your hosting provider for assistance. Hubzilla will not work correctly if you cannot perform this step. -You should also be sure that $a->config['system']['php_path'] is set correctly +You should also be sure that App::$config['system']['php_path'] is set correctly in your .htconfig.php file, it should look like (changing it to the correct PHP location): -$a->config['system']['php_path'] = '/usr/local/php55/bin/php'; +App::$config['system']['php_path'] = '/usr/local/php55/bin/php'; ##################################################################### @@ -353,7 +353,7 @@ are NOT called with -d suhosin.executor.func.blacklist=none. So the simple solution is to put the correct parameters into .htconfig.php: // Location of PHP command line processor - $a->config['system']['php_path'] = '/usr/bin/php -d suhosin.executor.func.blacklist=none + App::$config['system']['php_path'] = '/usr/bin/php -d suhosin.executor.func.blacklist=none -d suhosin.executor.eval.blacklist=none'; diff --git a/install/htconfig.sample.php b/install/htconfig.sample.php index f64e2571b..1d9dc1a13 100755 --- a/install/htconfig.sample.php +++ b/install/htconfig.sample.php @@ -41,9 +41,9 @@ $default_timezone = 'America/Los_Angeles'; // What is your site name? DO NOT ADD A TRAILING SLASH! -$a->config['system']['baseurl'] = 'https://myredsite.example'; -$a->config['system']['sitename'] = "Hubzilla"; -$a->config['system']['location_hash'] = 'if the auto install failed, put a unique random string here'; +App::$config['system']['baseurl'] = 'https://myredsite.example'; +App::$config['system']['sitename'] = "Hubzilla"; +App::$config['system']['location_hash'] = 'if the auto install failed, put a unique random string here'; // These lines set additional security headers to be sent with all responses @@ -51,8 +51,8 @@ $a->config['system']['location_hash'] = 'if the auto install failed, put a uniqu // this header. content_security_policy may need to be disabled if you wish to // run the piwik analytics plugin or include other offsite resources on a page -$a->config['system']['transport_security_header'] = 1; -$a->config['system']['content_security_policy'] = 1; +App::$config['system']['transport_security_header'] = 1; +App::$config['system']['content_security_policy'] = 1; // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. @@ -65,13 +65,13 @@ $a->config['system']['content_security_policy'] = 1; // In order to perform system administration via the admin panel, admin_email // must precisely match the email address of the person logged in. -$a->config['system']['register_policy'] = REGISTER_OPEN; -$a->config['system']['register_text'] = ''; -$a->config['system']['admin_email'] = ''; +App::$config['system']['register_policy'] = REGISTER_OPEN; +App::$config['system']['register_text'] = ''; +App::$config['system']['admin_email'] = ''; // Location of PHP command line processor -$a->config['system']['php_path'] = 'php'; +App::$config['system']['php_path'] = 'php'; // Configure how we communicate with directory servers. @@ -80,7 +80,7 @@ $a->config['system']['php_path'] = 'php'; // DIRECTORY_MODE_PRIMARY = main directory server (you do not want this unless you are operating your own realm. one per realm.) // DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services (only local site members in directory) -$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; +App::$config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; // PHP error logging setup |