diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-02 16:53:47 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-02 16:53:47 -0400 |
| commit | 9cb3fc226a9246b36810338f0ee8a115738cc97b (patch) | |
| tree | cfc4babf70100eda5a62a23c9a31b5666466c6c3 /mod/events.php | |
| parent | 5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c (diff) | |
| parent | 6dfd55668f39d2cfb27d468cc982471abaad5165 (diff) | |
| download | volse-hubzilla-9cb3fc226a9246b36810338f0ee8a115738cc97b.tar.gz volse-hubzilla-9cb3fc226a9246b36810338f0ee8a115738cc97b.tar.bz2 volse-hubzilla-9cb3fc226a9246b36810338f0ee8a115738cc97b.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
diabook-themes: css-fixes
diabook-themes: fixes in js
diabook-themes: fixed pageheader
diabook-themes: bugfixes / css-fixes
make the "new calendar" (javascript interactive) the default
remove zrl from query string
catch a couple more Oo smilies
add page_content_top hook
* 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(), |