diff --git a/www/admin/smarty_test.php b/www/admin/smarty_test.php index 320ef451..6a941119 100755 --- a/www/admin/smarty_test.php +++ b/www/admin/smarty_test.php @@ -16,10 +16,10 @@ $CSS_NAME = 'smart_test.css'; $USE_PROTOTYPE = false; $USE_JQUERY = true; if ($USE_PROTOTYPE) { - $EDIT_JAVASCRIPT = 'edit.pt.js'; + $ADMIN_JAVASCRIPT = 'edit.pt.js'; $JS_NAME = 'prototype.test.js'; -} else if ($USE_JQUERY) { - $EDIT_JAVASCRIPT = 'edit.jq.js'; +} elseif ($USE_JQUERY) { + $ADMIN_JAVASCRIPT = 'edit.jq.js'; $JS_NAME = 'jquery.test.js'; } $PAGE_WIDTH = "100%"; diff --git a/www/lib/CoreLibs/Basic.inc b/www/lib/CoreLibs/Basic.inc index a5bfdfe2..0c17fbf6 100644 --- a/www/lib/CoreLibs/Basic.inc +++ b/www/lib/CoreLibs/Basic.inc @@ -1453,7 +1453,7 @@ class Basic // PARAMS: start date, end date // RETURN: overall days, week days, weekend days as array 0...2 or named // DESC : calculates the days between two dates - private function calcDaysInterval($start_date, $end_date, $return_named = false) + public static function calcDaysInterval($start_date, $end_date, $return_named = false) { // pos 0 all, pos 1 weekday, pos 2 weekend $days = array ();