[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5820-g06cf763
Michal Čihař
nijel at users.sourceforge.net
Wed Jul 21 13:45:39 CEST 2010
The branch, master has been updated
via 06cf763358f9c6cda440538fb2148b9f7f3a9f4f (commit)
from 2490329af1d4f2a676512135db9b71222307326c (commit)
- Log -----------------------------------------------------------------
commit 06cf763358f9c6cda440538fb2148b9f7f3a9f4f
Author: Michal Čihař <mcihar at novell.com>
Date: Wed Jul 21 13:45:32 2010 +0200
[interface] Better formatting for SQL validator results.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
libraries/common.lib.php | 12 ++++++++++--
themes/original/css/theme_right.css.php | 2 +-
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 165e091..bc2ec78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,7 @@ $Id$
+ [code] Centralized format string expansion, @VARIABLES@ are recommended way
now.
+ [validator] SQL validator works also with SOAP PHP extension.
+- [interface] Better formatting for SQL validator results.
3.3.6.0 (not yet released)
- bug #3031705 [core] Do not use CONCAT for DECIMAL fields.
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 61bb709..7e79faf 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1250,7 +1250,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
$validate_link = '';
} //validator
- echo '<code class="sql">';
+ if (!empty($GLOBALS['validatequery'])) {
+ echo '<div class="sqlvalidate">';
+ } else {
+ echo '<code class="sql">';
+ }
if ($query_too_big) {
echo $shortened_query_base;
} else {
@@ -1261,7 +1265,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
if (! empty($GLOBALS['show_as_php'])) {
echo '";';
}
- echo '</code>';
+ if (!empty($GLOBALS['validatequery'])) {
+ echo '</div>';
+ } else {
+ echo '</code>';
+ }
echo '<div class="tools">';
// avoid displaying a Profiling checkbox that could
diff --git a/themes/original/css/theme_right.css.php b/themes/original/css/theme_right.css.php
index 4cd48ea..53f0f23 100644
--- a/themes/original/css/theme_right.css.php
+++ b/themes/original/css/theme_right.css.php
@@ -1152,7 +1152,7 @@ label.desc {
float: <?php echo $left; ?>;
}
-code.sql {
+code.sql, div.sqlvalidate {
display: block;
padding: 0.3em;
margin-top: 0;
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list