gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Pootle server 2011-08-16 02:40:33 +02:00
commit 7d185b406a
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/Tracker.class.php
View File

@ -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

6
libraries/config/FormDisplay.class.php
View File

@ -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;
}

2
setup/styles.css
View File

@ -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 {