[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-14995-g670b6ea

[Michal Čihař]

The branch, master has been updated
       via  670b6ea38b626750bd7ceaee393542e461d04c2b (commit)
      from  83b859f679a36e8873477c45490dd46eb923cf5a (commit)


- Log -----------------------------------------------------------------
commit 670b6ea38b626750bd7ceaee393542e461d04c2b
Author: Michal Čihař <mcihar at suse.cz>
Date:   Mon Aug 15 11:18:25 2011 +0200

    Fix test with lang set

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

Summary of changes:
 test/classes/Advisor_test.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/test/classes/Advisor_test.php b/test/classes/Advisor_test.php
index 4f30f57..d5d9dda 100644
--- a/test/classes/Advisor_test.php
+++ b/test/classes/Advisor_test.php
@@ -19,6 +19,7 @@ class Advisor_test extends PHPUnit_Framework_TestCase
     public function setup()
     {
         $_SESSION[' PMA_token '] = 'token';
+        $GLOBALS['lang'] = 'en';
     }
 
     /**
@@ -71,7 +72,7 @@ class Advisor_test extends PHPUnit_Framework_TestCase
             ),
             array(
                 array('justification' => 'foo', 'name' => 'Variable', 'issue' => 'issue', 'recommendation' => 'Recommend {status_var}'),
-                array('justification' => 'foo', 'name' => 'Variable', 'issue' => 'issue', 'recommendation' => 'Recommend <a href="server_variables.php?token=token#filter=status_var">status_var</a>'),
+                array('justification' => 'foo', 'name' => 'Variable', 'issue' => 'issue', 'recommendation' => 'Recommend <a href="server_variables.php?lang=en&token=token#filter=status_var">status_var</a>'),
             ),
             array(
                 array('justification' => '%s foo | value', 'name' => 'Format', 'issue' => 'issue', 'recommendation' => 'Recommend'),


hooks/post-receive
-- 
phpMyAdmin