[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA3-810-g8cd7179

[Madhura Jayaratne]

The branch, master has been updated
       via  8cd7179f80581ff86e5cc3f4ddd10e4f688cf515 (commit)
       via  da82fe392b0ac802284abee3810aae9f2bc4b381 (commit)
      from  e831df2a32e7aa7f420fca1c65b797891a298fca (commit)


- Log -----------------------------------------------------------------
commit 8cd7179f80581ff86e5cc3f4ddd10e4f688cf515
Merge: da82fe392b0ac802284abee3810aae9f2bc4b381 e831df2a32e7aa7f420fca1c65b797891a298fca
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Fri Feb 18 18:56:20 2011 +0530

    Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit da82fe392b0ac802284abee3810aae9f2bc4b381
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Fri Feb 18 18:54:36 2011 +0530

    Bug #3183970 Losing SQL history

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

Summary of changes:
 libraries/relation.lib.php |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/libraries/relation.lib.php b/libraries/relation.lib.php
index 18504e2..9588853 100644
--- a/libraries/relation.lib.php
+++ b/libraries/relation.lib.php
@@ -22,7 +22,7 @@ if (! defined('PHPMYADMIN')) {
  */
 function PMA_query_as_controluser($sql, $show_error = true, $options = 0)
 {
-    // Avoid caching of the number of rows affected; for example, this function 
+    // Avoid caching of the number of rows affected; for example, this function
     // is called for tracking purposes but we want to display the correct number
     // of rows affected by the original query, not by the query generated for
     // tracking.
@@ -760,10 +760,6 @@ function PMA_getHistory($username)
 {
     $cfgRelation = PMA_getRelationsParam();
 
-    if (isset($_SESSION['sql_history'])) {
-        return array_reverse($_SESSION['sql_history']);
-    }
-
     if (! $cfgRelation['historywork']) {
         return false;
     }


hooks/post-receive
-- 
phpMyAdmin