diff options
| author | Michael Vogel <icarus@dabo.de> | 2012-04-02 22:00:22 +0200 |
|---|---|---|
| committer | Michael Vogel <icarus@dabo.de> | 2012-04-02 22:00:22 +0200 |
| commit | 3dc317dcc62c8e982d964bcae421a1410771d51c (patch) | |
| tree | 6e63f4e263a6637656ed24dfb5c36292d442c268 /mod/events.php | |
| parent | a39d8d3f02e5bbd711fde71594c2c787b21ef2e9 (diff) | |
| parent | 6dfd55668f39d2cfb27d468cc982471abaad5165 (diff) | |
| download | volse-hubzilla-3dc317dcc62c8e982d964bcae421a1410771d51c.tar.gz volse-hubzilla-3dc317dcc62c8e982d964bcae421a1410771d51c.tar.bz2 volse-hubzilla-3dc317dcc62c8e982d964bcae421a1410771d51c.zip | |
Merge commit 'upstream/master'
Diffstat (limited to 'mod/events.php')
| -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 --- 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(), |