From ba0b2366985c78c29abfee94f309e3ebe070be47 Mon Sep 17 00:00:00 2001 From: konrad Date: Thu, 14 Jan 2010 17:55:49 +0000 Subject: [PATCH] make index.php intermittently call-able again git-svn-id: https://silmor.de/svn/softmagic/smoke/trunk@414 6e3c4bff-ac9f-4ac1-96c5-d2ea494d3e33 --- www/inc/loader_nonadmin.php | 1 + www/inc/machine/session.php | 1 + www/machine.php | 1 - 3 files changed, 2 insertions(+), 1 deletions(-) diff --git a/www/inc/loader_nonadmin.php b/www/inc/loader_nonadmin.php index 7ee0944..67a3aa8 100644 --- a/www/inc/loader_nonadmin.php +++ b/www/inc/loader_nonadmin.php @@ -4,5 +4,6 @@ if(!$db->canUseDb()) die("Database is not correctly configured. Giving up."); //load class-files include('./inc/classes/autoload.php'); +include("./inc/machine/autoload.php"); ?> \ No newline at end of file diff --git a/www/inc/machine/session.php b/www/inc/machine/session.php index fe9e70f..a61cebf 100644 --- a/www/inc/machine/session.php +++ b/www/inc/machine/session.php @@ -215,6 +215,7 @@ class DummyWebSession extends Session { public function __construct() { + global $db; //there is no real user for web (so far) $this->user="(web)"; //fake web role, web pages check for it diff --git a/www/machine.php b/www/machine.php index bb057a7..8e32cc1 100644 --- a/www/machine.php +++ b/www/machine.php @@ -5,7 +5,6 @@ header("Content-Type: application/x-MagicSmoke"); //initialize include("inc/loader.php"); include("inc/loader_nonadmin.php"); -include("./inc/machine/autoload.php"); //let wob do the rest WobTransaction::handle(); -- 1.7.2.5