Merge branch 'develop' into 'master'

Develop See merge request !9
fluxapps · May 11, 2016 · 79f94ea · 79f94ea
2 parents 54b763b + db0d82a
commit 79f94ea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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();
 	}
 
 
-	protected 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');

diff --git a/plugin.php b/plugin.php
@@ -1,7 +1,7 @@
 <?php
 $id = 'xlvo';
-$version = '3.0.2';
+$version = '3.0.3';
 $ilias_min_version = '5.0.0';
-$ilias_max_version = '5.2.999';
+$ilias_max_version = '5.1.999';
 $responsible = 'studer + raimann ag';
 $responsible_mail = 'info at studer-raimann.ch';