diff options
| author | zottel <github@zottel.net> | 2012-04-03 09:27:46 +0200 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2012-04-03 09:27:46 +0200 |
| commit | e5cd5aab5cf5fd5019ec3178f09f5515c390c9d9 (patch) | |
| tree | 76e322f19d3ada0106a2c7c9664537e602ed88ed /mod/events.php | |
| parent | 7127626f55f0ae5843d38145bf80022b98e4a8d8 (diff) | |
| parent | 5d0d9f877294258cb90e1c496b4db750ee99f3ca (diff) | |
| download | volse-hubzilla-e5cd5aab5cf5fd5019ec3178f09f5515c390c9d9.tar.gz volse-hubzilla-e5cd5aab5cf5fd5019ec3178f09f5515c390c9d9.tar.bz2 volse-hubzilla-e5cd5aab5cf5fd5019ec3178f09f5515c390c9d9.zip | |
Merge remote branch '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(), |