From de06b3d8e26dba15c23bad6a634f5057eb267b24 Mon Sep 17 00:00:00 2001 From: jsatoh Date: Tue, 3 Dec 2013 09:47:07 +0000 Subject: [PATCH] 2013-12-03 Junichi Satoh * include/functions_treeview.php: Fixed sql error in tag tab. * ChangeLog: Fixed date in my previous commit. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@9154 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 +++++++- pandora_console/include/functions_treeview.php | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 3832ddb6af..cdaacef32f 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,4 +1,10 @@ -2013-12-01 Junichi Satoh +2013-12-03 Junichi Satoh + + * include/functions_treeview.php: Fixed sql error in tag tab. + + * ChangeLog: Fixed date in my previous commit. + +2013-12-02 Junichi Satoh * include/functions_treeview.php: Fixed tree expansion failure by module. diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php index ccbe0821d6..628253c2c1 100755 --- a/pandora_console/include/functions_treeview.php +++ b/pandora_console/include/functions_treeview.php @@ -958,7 +958,7 @@ function treeview_getData ($type) { AND ttag_module.id_agente_modulo = tagente_modulo.id_agente_modulo" . $search_sql . $user_tags_sql . - "ORDER BY ttag.name COLLATE utf8_general_ci ASC"; + " ORDER BY ttag.name COLLATE utf8_general_ci ASC"; $list = db_get_all_rows_sql($sql); break;