From c11a81dbefa74e4ef33de8567bf38f51f7466114 Mon Sep 17 00:00:00 2001
From: mdtrooper <tres.14159@gmail.com>
Date: Thu, 19 Feb 2015 18:33:42 +0100
Subject: [PATCH] Fixed the ajax calls with timepicker in other languages
 instead english. (cherry picked from commit
 15c93c3bd9b7e80e1a44c50321be8ded612681e9)

Conflicts:
	pandora_console/include/ajax/module.php
---
 pandora_console/include/ajax/module.php  |  4 ++--
 pandora_console/include/functions_ui.php | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index d11ddea392..82630801b0 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -79,7 +79,7 @@ if ($get_module_detail) {
 	
 	if (defined ('METACONSOLE')) {
 		$server = metaconsole_get_connection ($server_name);
-
+		
 		if (metaconsole_connect($server) != NOERR)
 			return;
 		$conexion = false;
@@ -87,7 +87,7 @@ if ($get_module_detail) {
 	else {
 		$conexion = false;
 	}
-	html_debug_print($conexion, true);
+	
 	$selection_mode = get_parameter('selection_mode', 'fromnow');
 	$date_from = (string) get_parameter ('date_from', date ('Y-m-j'));
 	$time_from = (string) get_parameter ('time_from', date ('h:iA'));
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index e6c89e1c24..95b3d67bef 100755
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -3575,10 +3575,18 @@ function ui_get_error ($error_code) {
 }
 
 function ui_include_time_picker() {
-	ui_require_jquery_file ("ui-timepicker-addon");
+	if (is_ajax ()) {
+		echo '<script type="text/javascript" src="' .
+			ui_get_full_url(false, false, false, false) .
+			'include/javascript/jquery.ui-timepicker-addon.js' . '"></script>';
+	}
+	else {
+		ui_require_jquery_file ("ui-timepicker-addon");
+	}
 	
 	if (file_exists('include/javascript/i18n/jquery-ui-timepicker-' . substr(get_user_language(), 0, 2) . '.js')) {
-		echo '<script type="text/javascript" src="' . ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . substr(get_user_language(), 0, 2) . '.js', false, false, false) . '"></script>';
+		echo '<script type="text/javascript" src="' .
+			ui_get_full_url('include/javascript/i18n/jquery-ui-timepicker-' . substr(get_user_language(), 0, 2) . '.js', false, false, false) . '"></script>';
 	}
 }
 ?>