Merge branch 'pull'

[friendica.git] / mod / events.php

diff --git a/mod/events.php b/mod/events.php
index e10f508dd6a9e5efcfa9bcbdc983d52f35d8a388..0906d16c2ee21687c32bc5d3e7553df82c0ba9d2 100755 (executable)
--- a/mod/events.php
+++ b/mod/events.php
@@ -284,7 +284,11 @@ function events_content(&$a) {
                if (x($_GET,'id')){
                        $tpl =  get_markup_template("event.tpl");
                } else {
-                       $tpl = get_markup_template("events.tpl");
+                       if (get_config('experimentals','new_calendar')==1){
+                               $tpl = get_markup_template("events-js.tpl");
+                       } else {
+                               $tpl = get_markup_template("events.tpl");
+                       }
                }
                $o = replace_macros($tpl, array(
                        '$baseurl'      => $a->get_baseurl(),