[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17208-g66a2dc2

[Michal Čihař]

The branch, master has been updated
       via  66a2dc25c4ac79ff99438b7d1474a7d07bc9fdb0 (commit)
       via  5cfb049561e297f9fe5d7166963053057da784d1 (commit)
      from  1b8018e4368ff5043548e25f08e915805e280e7d (commit)


- Log -----------------------------------------------------------------
commit 66a2dc25c4ac79ff99438b7d1474a7d07bc9fdb0
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Aug 25 08:37:53 2011 +0200

    Whitespace cleanup

commit 5cfb049561e297f9fe5d7166963053057da784d1
Author: Michal Čihař <michal at cihar.com>
Date:   Thu Aug 25 08:37:45 2011 +0200

    Include sprintf for gis_data_editor.js

-----------------------------------------------------------------------

Summary of changes:
 sql.php        |    7 ++++---
 tbl_change.php |    1 +
 tbl_select.php |    3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sql.php b/sql.php
index 715f7f2..b233400 100644
--- a/sql.php
+++ b/sql.php
@@ -20,6 +20,7 @@ $GLOBALS['js_include'][] = 'tbl_change.js';
 
 // required for GIS editor loaded via AJAX
 $GLOBALS['js_include'][] = 'gis_data_editor.js';
+$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.svg.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.mousewheel.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.event.drag-2.0.min.js';
@@ -34,7 +35,7 @@ if (isset($_SESSION['profiling'])) {
     /* < IE 9 doesn't support canvas natively */
     if (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER < 9) {
         $GLOBALS['js_include'][] = 'canvg/flashcanvas.js';
-    }	
+    }
     $GLOBALS['js_include'][] = 'canvg/canvg.js';
 }
 
@@ -781,7 +782,7 @@ else {
         $GLOBALS['js_include'][] = 'functions.js';
         $GLOBALS['js_include'][] = 'makegrid.js';
         $GLOBALS['js_include'][] = 'sql.js';
-        
+
         // Gets the list of fields properties
         if (isset($result) && $result) {
             $fields_meta = PMA_DBI_get_fields_meta($result);
@@ -798,7 +799,7 @@ else {
         if (PMA_is_system_schema($db)) {
             $disp_mode = 'nnnn110111';
         }
-        
+
         $message = PMA_Message::success($message);
         echo PMA_showMessage($message, $GLOBALS['sql_query'], 'success');
         PMA_displayTable($result, $disp_mode, $analyzed_sql);
diff --git a/tbl_change.php b/tbl_change.php
index 0a3e54d..6024d80 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -125,6 +125,7 @@ $GLOBALS['js_include'][] = 'jquery/timepicker.js';
 
 // required for GIS editor
 $GLOBALS['js_include'][] = 'gis_data_editor.js';
+$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.svg.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.mousewheel.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.event.drag-2.0.min.js';
diff --git a/tbl_select.php b/tbl_select.php
index 1191c3a..b9c23d5 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -26,6 +26,7 @@ $GLOBALS['js_include'][] = 'jquery/timepicker.js';
 
 // required for GIS editor loaded via AJAX
 $GLOBALS['js_include'][] = 'gis_data_editor.js';
+$GLOBALS['js_include'][] = 'jquery/jquery.sprintf.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.svg.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.mousewheel.js';
 $GLOBALS['js_include'][] = 'jquery/jquery.event.drag-2.0.min.js';
@@ -310,4 +311,4 @@ else {
     require './sql.php';
 }
 
-?>
\ No newline at end of file
+?>


hooks/post-receive
-- 
phpMyAdmin