Merge

main/inc/lib/main_api.lib.php

@@ -1580,9 +1580,9 @@ function api_get_session_condition($session_id, $state = true, $both = false) {
 	$condition_session = '';
 	$condition_add = $state == false ? " WHERE " : " AND ";		
 	if ($session_id > 0) {		
-		$condition_session = $condition_add."(session_id = ".(int)$session_id." OR session_id = 0)";		
+		$condition_session = $condition_add." (session_id = ".(int)$session_id." OR session_id = 0) ";		
 	} else {
-		$condition_session = $condition_add."session_id = 0";
+		$condition_session = $condition_add." session_id = 0 ";
 	}
 	return $condition_session;
 }

main/install/install_db.inc.php

@@ -110,10 +110,13 @@ if ($mysqlUserDb != $mysqlMainDb) {
 	}
 }
 
-include api_get_path(SYS_LANG_PATH).'english/create_course.inc.php';
+// This parameter is needed to run a command line install of Chamilo (needed for Phing)
+if(!defined('CLI_INSTALLATION')) {
+	include api_get_path(SYS_LANG_PATH).'english/create_course.inc.php';
 
-if ($languageForm != 'english') {
-	include api_get_path(SYS_LANG_PATH).$languageForm.'/create_course.inc.php';
+	if ($languageForm != 'english') {
+		include api_get_path(SYS_LANG_PATH).$languageForm.'/create_course.inc.php';
+	}
 }
 
 /**