From 50293004adc930ee21c0e1136bfd1c85790855fa Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Sun, 2 Oct 2011 06:58:35 +0530
Subject: [PATCH 1/2] Fix failing tests

---
 test/libraries/common/PMA_showPHPDocu_test.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php
index 09cebbfd0a..6b95d4b796 100644
--- a/test/libraries/common/PMA_showPHPDocu_test.php
+++ b/test/libraries/common/PMA_showPHPDocu_test.php
@@ -20,6 +20,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
     function setup()
     {
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
+        $_SESSION[' PMA_token '] = 'token';
+        $GLOBALS['lang'] = 'en';
         $GLOBALS['server'] = 99;
         $GLOBALS['cfg']['ServerDefault'] = 0;
     }
@@ -30,7 +32,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
 
         $target = "docu";
         $lang = _pgettext('PHP documentation language', 'en');
-        $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '&amp;server=99'
+        $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang
+            . '%2F' . $target . '&amp;server=99&amp;lang=en&amp;token=token"'
             . '" target="documentation"><img src="themes/dot.gif" title="'
             . __('Documentation') . '" alt="' . __('Documentation') . '" class="icon ic_b_help" /></a>';
 
@@ -43,7 +46,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
 
         $target = "docu";
         $lang = _pgettext('PHP documentation language', 'en');
-        $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '&amp;server=99'
+        $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang
+            . '%2F' . $target . '&amp;server=99&amp;lang=en&amp;token=token"'
             . '" target="documentation">' . __('Documentation') . '</a>]';
 
         $this->assertEquals($expected, PMA_showPHPDocu($target));

From e15ff037e3d8e2771d84eee423195c5b78a6bc3b Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Sun, 2 Oct 2011 07:11:57 +0530
Subject: [PATCH 2/2] typo

---
 test/libraries/common/PMA_showPHPDocu_test.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php
index 6b95d4b796..fe24855ccb 100644
--- a/test/libraries/common/PMA_showPHPDocu_test.php
+++ b/test/libraries/common/PMA_showPHPDocu_test.php
@@ -33,7 +33,7 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
         $target = "docu";
         $lang = _pgettext('PHP documentation language', 'en');
         $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang
-            . '%2F' . $target . '&amp;server=99&amp;lang=en&amp;token=token"'
+            . '%2F' . $target . '&amp;server=99&amp;lang=en&amp;token=token'
             . '" target="documentation"><img src="themes/dot.gif" title="'
             . __('Documentation') . '" alt="' . __('Documentation') . '" class="icon ic_b_help" /></a>';
 
@@ -47,7 +47,7 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
         $target = "docu";
         $lang = _pgettext('PHP documentation language', 'en');
         $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang
-            . '%2F' . $target . '&amp;server=99&amp;lang=en&amp;token=token"'
+            . '%2F' . $target . '&amp;server=99&amp;lang=en&amp;token=token'
             . '" target="documentation">' . __('Documentation') . '</a>]';
 
         $this->assertEquals($expected, PMA_showPHPDocu($target));