mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Added CLI check required for Metatron

Browse Source
This commit is contained in:
Matthias Gutjahr 2013-09-06 14:23:34 +02:00
parent bb7ca06680
commit 5267970499
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
serendipity_config.inc.php
View File

@ -8,7 +8,7 @@ if (defined('S9Y_FRAMEWORK')) {
@define('S9Y_FRAMEWORK', true);
if (!headers_sent()) {
if (!headers_sent() && php_sapi_name() !== 'cli') {
// Only set the session name, if no session has yet been issued.
if (session_id() == '') {
session_name('s9y_' . md5(dirname(__FILE__)));
@ -312,7 +312,7 @@ if ( (isset($serendipity['autodetect_baseURL']) && serendipity_db_bool($serendip
* If a user is logged in, fetch his preferences. He possibly wants to have a different language
*/
if (IS_installed === true) {
if (IS_installed === true && php_sapi_name() !== 'cli') {
// Import HTTP auth (mostly used for RSS feeds)
if ($serendipity['useHTTP-Auth'] && (isset($_REQUEST['http_auth']) || isset($_SERVER['PHP_AUTH_USER']))) {
if (!isset($_SERVER['PHP_AUTH_USER'])) {