The branch, master has been updated
via 1ea24eb0836b303bda715b4f91cfd34f8a1d4287 (commit)
via 0fb5a8857c4b57dd1713a8f51114a4eb21e8ecf8 (commit)
via 553f6b2f9a037d89f573732ce2635823f20a5ddc (commit)
from 3782a6c89b1ef507d6a777e68509870c7ac3020c (commit)
- Log -----------------------------------------------------------------
commit 1ea24eb0836b303bda715b4f91cfd34f8a1d4287
Author: Piotr Przybylski <[email protected]>
Date: Tue Aug 16 01:04:51 2011 +0200
Better variable name
commit 0fb5a8857c4b57dd1713a8f51114a4eb21e8ecf8
Author: Piotr Przybylski <[email protected]>
Date: Tue Aug 16 00:45:47 2011 +0200
Fix div icon
commit 553f6b2f9a037d89f573732ce2635823f20a5ddc
Author: Piotr Przybylski <[email protected]>
Date: Tue Aug 16 00:40:53 2011 +0200
Fix comments
-----------------------------------------------------------------------
Summary of changes:
libraries/Tracker.class.php | 17 ++++++++---------
libraries/config/FormDisplay.class.php | 6 +++---
setup/styles.css | 2 +-
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/libraries/Tracker.class.php b/libraries/Tracker.class.php
index aa176ea..5d24b78 100644
--- a/libraries/Tracker.class.php
+++ b/libraries/Tracker.class.php
@@ -254,7 +254,7 @@ class PMA_Tracker
* @param string $tablename name of table
* @param string $version version
* @param string $tracking_set set of tracking statements
- * @param string $is_view if table is a view
+ * @param bool $is_view if table is a view
*
* @return int result of version insertion
*/
@@ -469,11 +469,11 @@ class PMA_Tracker
*
* @static
*
- * @param string $dbname name of database
- * @param string $tablename name of table
- * @param string $version version
- * @param string $type type of data(DDL || DML)
- * @param string || array $new_data the new tracking data
+ * @param string $dbname name of database
+ * @param string $tablename name of table
+ * @param string $version version
+ * @param string $type type of data(DDL || DML)
+ * @param string|array $new_data the new tracking data
*
* @return bool result of change
*/
@@ -890,7 +890,6 @@ class PMA_Tracker
/**
* Analyzes a given SQL statement and saves tracking data.
*
- *
* @static
* @param string $query a SQL query
*/
@@ -898,7 +897,7 @@ class PMA_Tracker
{
// If query is marked as untouchable, leave
if (strstr($query, "/*NOTRACK*/")) {
- return false;
+ return;
}
if (! (substr($query, -1) == ';')) {
@@ -912,7 +911,7 @@ class PMA_Tracker
// $dbname can be empty, for example when coming from Synchronize
// and this is a query for the remote server
if (empty($dbname)) {
- return false;
+ return;
}
// If we found a valid statement
diff --git a/libraries/config/FormDisplay.class.php
b/libraries/config/FormDisplay.class.php
index 3725878..e3010fc 100644
--- a/libraries/config/FormDisplay.class.php
+++ b/libraries/config/FormDisplay.class.php
@@ -467,10 +467,10 @@ class FormDisplay
}
$this->errors = array();
- foreach ($forms as $form) {
+ foreach ($forms as $form_name) {
/* @var $form Form */
- if (isset($this->forms[$form])) {
- $form = $this->forms[$form];
+ if (isset($this->forms[$form_name])) {
+ $form = $this->forms[$form_name];
} else {
continue;
}
diff --git a/setup/styles.css b/setup/styles.css
index 07979b4..5ec7b16 100644
--- a/setup/styles.css
+++ b/setup/styles.css
@@ -123,7 +123,7 @@ div.notice[id^=version_check] h4 {
div.warning {
border-color: #C00;
background-color: #FFC;
- background-image: url(../themes/original/img/s_warn.png);
+ background-image: url(../themes/original/img/s_notice.png);
}
div.warning h4 {
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
uberSVN's rich system and user administration capabilities and model
configuration take the hassle out of deploying and managing Subversion and
the tools developers use with it. Learn more about uberSVN and get a free
download at: http://p.sf.net/sfu/wandisco-dev2dev
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
