Fix Kunena#554 Installer: turn off language debug while adding data i…

…nto DB
coder4life · Apr 15, 2012 · 551e450 · 551e450
1 parent b233f6f
commit 551e450
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/administrator/components/com_kunena/install/data/sampledata.php b/administrator/components/com_kunena/install/data/sampledata.php
@@ -19,6 +19,9 @@ function _($string) {
 
 function installSampleData()
 {
+	$lang = JFactory::getLanguage();
+	$debug = $lang->setDebug(false);
+
 	jimport ( 'joomla.utilities.date' );
 
 	$db = JFactory::getDBO();
@@ -207,5 +210,7 @@ function installSampleData()
 			$counter++;
 		}
 	}
+
+	$lang->setDebug($debug);
 	return $counter;
 }
diff --git a/administrator/components/com_kunena/install/model.php b/administrator/components/com_kunena/install/model.php
@@ -333,15 +333,18 @@ function publishPlugin($folder, $name, $enable = 1) {
 	}
 
 	function installModule($path, $name) {
+		$success = false;
+
 		$dest = JPATH_ROOT."/tmp/kinstall_mod_{$name}";
 		if (file_exists($dest)) JFolder::delete($dest);
-		if (is_file(KPATH_ADMIN .'/'. $path)) {
-			// Extract file
-			$success = $this->extract ( KPATH_ADMIN, $path, $dest );
-		} else {
+			if (is_dir(KPATH_ADMIN .'/'. $path)) {
 			// Copy path
 			$success = JFolder::copy(KPATH_ADMIN .'/'. $path, $dest);
+		} elseif (is_file(KPATH_ADMIN .'/'. $path)) {
+			// Extract file
+			$success = $this->extract ( KPATH_ADMIN, $path, $dest );
 		}
+
 		// We need to have only one manifest which is named as kunena.xml
 		if (version_compare(JVERSION, '1.6','>')) {
 			// Joomla 2.5+
@@ -383,16 +386,19 @@ function installModule($path, $name) {
 	}
 
 	function installPlugin($path, $group, $name, $publish) {
+		$success = false;
+
 		$dest = JPATH_ROOT."/tmp/kinstall_plg_{$group}_{$name}";
 		if (file_exists($dest)) JFolder::delete($dest);
-		if (is_file(KPATH_ADMIN .'/'. $path)) {
-			// Extract file
-			$success = $this->extract ( KPATH_ADMIN, $path, $dest );
-		} else {
+		if (is_dir(KPATH_ADMIN .'/'. $path)) {
 			// Copy path
 			$success = JFolder::copy(KPATH_ADMIN .'/'. $path, $dest);
+		} elseif (is_file(KPATH_ADMIN .'/'. $path)) {
+			// Extract file
+			$success = $this->extract ( KPATH_ADMIN, $path, $dest );
 		}
-		// We need to have only one manifest which is named as kunena.xml
+
+		// We need to have only one manifest which is named as xxx.xml
 		if (version_compare(JVERSION, '1.6','>')) {
 			// Joomla 1.6+
 			if ($success && is_file("{$dest}/{$name}.j15.xml")) {
@@ -411,8 +417,8 @@ function installPlugin($path, $group, $name, $publish) {
 			}
 		}
 		// TODO: copy all language files to module directory
-		$success = JFolder::create($dest.'/language/en-GB');
-		$success = JFile::copy(KPATH_ADMIN."/language/index.html", "{$dest}/language/en-GB/index.html");
+		if ($success) $success = JFolder::create($dest.'/language/en-GB');
+		if ($success) $success = JFile::copy(KPATH_ADMIN."/language/index.html", "{$dest}/language/en-GB/index.html");
 		if ($success && is_file(KPATH_ADMIN."/language/en-GB/en-GB.plg_{$group}_{$name}.ini")) {
 			$success = JFile::copy(KPATH_ADMIN."/language/en-GB/en-GB.plg_{$group}_{$name}.ini", "{$dest}/language/en-GB/en-GB.plg_{$group}_{$name}.ini");
 		}
@@ -587,7 +593,7 @@ public function stepPlugins() {
 		//$this->installPlugin('install/plugins/plg_finder_kunena', 'finder', 'kunena', false);
 		$this->installPlugin('install/plugins/plg_kunena_kunena', 'kunena', 'kunena', true);
 		$this->installPlugin('install/plugins/plg_kunena_joomla15', 'kunena', 'joomla', true);
-		$this->installPlugin('install/plugins/plg_kunena_joomla16', 'kunena', 'joomla', true);
+		$this->installPlugin('install/plugins/plg_kunena_joomla25', 'kunena', 'joomla', true);
 		$this->installPlugin('install/plugins/plg_kunena_alphauserpoints', 'kunena', 'alphauserpoints', false);
 		$this->installPlugin('install/plugins/plg_kunena_comprofiler', 'kunena', 'comprofiler', false);
 		$this->installPlugin('install/plugins/plg_kunena_community', 'kunena', 'community', false);
@@ -1634,13 +1640,16 @@ function createMenu() {
 			$submenu['help']['params']['body'] = "[article=full]{$config->help_cid}[/article]";
 			$submenu['help']['params']['body_format'] = 'bbcode';
 		}
+		$lang = JFactory::getLanguage();
+		$debug = $lang->setDebug(false);
 		if (version_compare(JVERSION, '1.6','>')) {
 			// Joomla 1.6+
 			$this->createMenuJ25($menu, $submenu);
 		} else {
 			// Joomla 1.5
 			$this->createMenuJ15($menu, $submenu);
 		}
+		$lang->setDebug($debug);
 	}
 
 	function createMenuJ15($menu, $submenu) {