mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-20 18:08:02 +02:00
Fixed it not loading properly, due to last nights changes to how classes are loaded
This commit is contained in:
parent
ace2ca59ce
commit
3e2952ece1
@ -18,9 +18,17 @@
|
|||||||
var $cats;
|
var $cats;
|
||||||
var $db;
|
var $db;
|
||||||
|
|
||||||
function categories($account_id,$app_name)
|
function categories($account_id = "",$app_name = "")
|
||||||
{
|
{
|
||||||
global $phpgw;
|
global $phpgw, $phpgw_info;
|
||||||
|
|
||||||
|
if (! $account_id) {
|
||||||
|
$account_id = $phpgw_info["user"]["account_id"];
|
||||||
|
}
|
||||||
|
if (! $app_name) {
|
||||||
|
$app_name = $phpgw_info["flags"]["currentapp"];
|
||||||
|
}
|
||||||
|
|
||||||
$this->account_id = $account_id;
|
$this->account_id = $account_id;
|
||||||
$this->app_name = $app_name;
|
$this->app_name = $app_name;
|
||||||
$this->db = $phpgw->db;
|
$this->db = $phpgw->db;
|
||||||
|
@ -128,7 +128,7 @@
|
|||||||
$sep = filesystem_separator();
|
$sep = filesystem_separator();
|
||||||
$template_root = $this->common->get_tpl_dir();
|
$template_root = $this->common->get_tpl_dir();
|
||||||
|
|
||||||
if (is_dir($template_root)) {
|
if (is_dir($template_root)) {
|
||||||
$this->template = CreateObject("phpgwapi.Template", $template_root);
|
$this->template = CreateObject("phpgwapi.Template", $template_root);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user