diff options
| author | Michael <icarus@dabo.de> | 2012-04-11 18:47:21 +0200 |
|---|---|---|
| committer | Michael <icarus@dabo.de> | 2012-04-11 18:47:21 +0200 |
| commit | c3139fa0fd49b0b4de4568d46a6946c75ccb2a62 (patch) | |
| tree | a46d809d2e11fefba938717d38b1371572e4d815 /mod/events.php | |
| parent | 81a8d4f9dbd32de133e647c87a5394dd52f009fe (diff) | |
| parent | fe257a20324fe68838e5829e19d18777045a41b4 (diff) | |
| download | volse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.tar.gz volse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.tar.bz2 volse-hubzilla-c3139fa0fd49b0b4de4568d46a6946c75ccb2a62.zip | |
Merge branch 'master' of github.com:annando/friendica
Diffstat (limited to 'mod/events.php')
| -rw-r--r--[-rwxr-xr-x] | mod/events.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mod/events.php b/mod/events.php index 0906d16c2..e66a2dc44 100755..100644 --- a/mod/events.php +++ b/mod/events.php @@ -284,11 +284,11 @@ function events_content(&$a) { if (x($_GET,'id')){ $tpl = get_markup_template("event.tpl"); } else { - if (get_config('experimentals','new_calendar')==1){ +// if (get_config('experimentals','new_calendar')==1){ $tpl = get_markup_template("events-js.tpl"); - } else { - $tpl = get_markup_template("events.tpl"); - } +// } else { +// $tpl = get_markup_template("events.tpl"); +// } } $o = replace_macros($tpl, array( '$baseurl' => $a->get_baseurl(), |