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:
Weblate 2013-07-30 15:21:12 +02:00
commit 0c04ca449c
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
libraries/Tracker.class.php
View File

@ -92,12 +92,14 @@ class PMA_Tracker
*/
static protected function init()
{
self::$pma_table = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb']) .".".
PMA_Util::backquote($GLOBALS['cfg']['Server']['tracking']);
self::$pma_table = PMA_Util::backquote($GLOBALS['cfg']['Server']['pmadb'])
. '.' . PMA_Util::backquote($GLOBALS['cfg']['Server']['tracking']);
self::$add_drop_table = $GLOBALS['cfg']['Server']['tracking_add_drop_table'];
self::$add_drop_table
= $GLOBALS['cfg']['Server']['tracking_add_drop_table'];
self::$add_drop_view = $GLOBALS['cfg']['Server']['tracking_add_drop_view'];
self::$add_drop_view
= $GLOBALS['cfg']['Server']['tracking_add_drop_view'];
self::$add_drop_database
= $GLOBALS['cfg']['Server']['tracking_add_drop_database'];
@ -330,7 +332,9 @@ class PMA_Tracker
'" . PMA_Util::sqlAddSlashes($snapshot) . "',
'" . PMA_Util::sqlAddSlashes($create_sql) . "',
'" . PMA_Util::sqlAddSlashes("\n") . "',
'" . PMA_Util::sqlAddSlashes(self::_transformTrackingSet($tracking_set)) . "' )";
'" . PMA_Util::sqlAddSlashes(
self::_transformTrackingSet($tracking_set)
) . "' )";
$result = PMA_queryAsControlUser($sql_query);
@ -419,7 +423,9 @@ class PMA_Tracker
'" . PMA_Util::sqlAddSlashes('') . "',
'" . PMA_Util::sqlAddSlashes($create_sql) . "',
'" . PMA_Util::sqlAddSlashes("\n") . "',
'" . PMA_Util::sqlAddSlashes(self::_transformTrackingSet($tracking_set)) . "' )";
'" . PMA_Util::sqlAddSlashes(
self::_transformTrackingSet($tracking_set)
) . "' )";
$result = PMA_queryAsControlUser($sql_query);
@ -574,7 +580,8 @@ class PMA_Tracker
*
* @static
*
* @return mixed record DDM log, DDL log, structure snapshot, tracked statements.
* @return mixed record DDM log, DDL log, structure snapshot, tracked
* statements.
*/
static public function getTrackedData($dbname, $tablename, $version)
{
@ -587,8 +594,8 @@ class PMA_Tracker
$sql_query .= " AND `table_name` = '"
. PMA_Util::sqlAddSlashes($tablename) ."' ";
}
$sql_query .= " AND `version` = '" . PMA_Util::sqlAddSlashes($version) ."' ".
" ORDER BY `version` DESC LIMIT 1";
$sql_query .= " AND `version` = '" . PMA_Util::sqlAddSlashes($version)
. "' " . " ORDER BY `version` DESC LIMIT 1";
$mixed = $GLOBALS['dbi']->fetchAssoc(PMA_queryAsControlUser($sql_query));
@ -1012,7 +1019,8 @@ class PMA_Tracker
$sql_query .=
" WHERE FIND_IN_SET('" . $result['identifier'] . "',tracking) > 0" .
" AND `db_name` = '" . PMA_Util::sqlAddSlashes($dbname) . "' " .
" AND `table_name` = '" . PMA_Util::sqlAddSlashes($result['tablename']) . "' " .
" AND `table_name` = '"
. PMA_Util::sqlAddSlashes($result['tablename']) . "' " .
" AND `version` = '" . PMA_Util::sqlAddSlashes($version) . "' ";
$result = PMA_queryAsControlUser($sql_query);