From 192bc861150f6a0367aa07533121d7f33886ef4c Mon Sep 17 00:00:00 2001 From: "paul.baranowski" Date: Mon, 18 Oct 2010 16:00:31 +0200 Subject: [PATCH] Fixed a bug in campcaster-import: "require_once" statements were out of order. Fixed bug in statusbar.tpl - syntax error. --- htmlUI/templates/statusbar.tpl | 2 +- utils/campcaster-import.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/htmlUI/templates/statusbar.tpl b/htmlUI/templates/statusbar.tpl index bf736e505..d314f9afb 100644 --- a/htmlUI/templates/statusbar.tpl +++ b/htmlUI/templates/statusbar.tpl @@ -9,7 +9,7 @@ - {assign var="_now value=$SCHEDULER->getSchedulerTime(true)} + {assign var="_now" value=$SCHEDULER->getSchedulerTime()} {if !$_now} {assign var="_now" value=$smarty.now} {/if} diff --git a/utils/campcaster-import.php b/utils/campcaster-import.php index a5f3e2746..50e1735f7 100644 --- a/utils/campcaster-import.php +++ b/utils/campcaster-import.php @@ -12,10 +12,10 @@ set_time_limit(0); error_reporting(E_ALL); set_error_handler("camp_import_error_handler", E_ALL & !E_NOTICE); -require_once('DB.php'); -require_once('Console/Getopt.php'); require_once(dirname(__FILE__)."/../conf.php"); require_once(dirname(__FILE__)."/../backend/GreenBox.php"); +require_once('DB.php'); +require_once('Console/Getopt.php'); function camp_import_error_handler() {