From 6a8314fadfe49357ec02bd768eee5e491178d27b Mon Sep 17 00:00:00 2001 From: Fabian Schmid Date: Wed, 11 May 2016 11:52:26 +0200 Subject: [PATCH 1/3] [FIX] 0018403 --- classes/Context/class.xlvoInitialisation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/Context/class.xlvoInitialisation.php b/classes/Context/class.xlvoInitialisation.php index 898b4d8e..2152d6b2 100644 --- a/classes/Context/class.xlvoInitialisation.php +++ b/classes/Context/class.xlvoInitialisation.php @@ -112,7 +112,7 @@ public static function initILIAS2() { } - protected static function initHTML() { + static function initHTML() { parent::initHTML(); if (self::USE_OWN_GLOBAL_TPL) { $tpl = new ilTemplate("tpl.main.html", true, true, 'Customizing/global/plugins/Services/Repository/RepositoryObject/LiveVoting'); From 7dc7c9ff0fc6b5cc4b14060d8b6e00d658b36887 Mon Sep 17 00:00:00 2001 From: Fabian Schmid Date: Wed, 11 May 2016 13:36:31 +0200 Subject: [PATCH 2/3] renamed initHTML due to inconsistence in core --- classes/Context/class.xlvoInitialisation.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/Context/class.xlvoInitialisation.php b/classes/Context/class.xlvoInitialisation.php index 2152d6b2..41e5b786 100644 --- a/classes/Context/class.xlvoInitialisation.php +++ b/classes/Context/class.xlvoInitialisation.php @@ -43,7 +43,7 @@ protected function run() { switch (self::getContext()) { case self::CONTEXT_ILIAS: require_once('./include/inc.header.php'); - self::initHTML(); + self::initHTML2(); // self::initILIAS(); break; case self::CONTEXT_PIN: @@ -108,11 +108,11 @@ public static function initILIAS2() { self::initUser(); self::initLanguage(); $tree->initLangCode(); - self::initHTML(); + self::initHTML2(); } - static function initHTML() { + protected static function initHTML2() { parent::initHTML(); if (self::USE_OWN_GLOBAL_TPL) { $tpl = new ilTemplate("tpl.main.html", true, true, 'Customizing/global/plugins/Services/Repository/RepositoryObject/LiveVoting'); From db0d82ac75d6745a67fd3b64ce1fdcf061df4cd1 Mon Sep 17 00:00:00 2001 From: Fabian Schmid Date: Wed, 11 May 2016 13:56:57 +0200 Subject: [PATCH 3/3] changed plugin-version --- plugin.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin.php b/plugin.php index 92abb189..a8e8f2f7 100644 --- a/plugin.php +++ b/plugin.php @@ -1,7 +1,7 @@