[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20533-g5029300

[Madhura Jayaratne]

The branch, master has been updated
       via  50293004adc930ee21c0e1136bfd1c85790855fa (commit)
      from  aa4dac81752c6c8d84838f098501fb9770735d73 (commit)


- Log -----------------------------------------------------------------
commit 50293004adc930ee21c0e1136bfd1c85790855fa
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Sun Oct 2 06:58:35 2011 +0530

    Fix failing tests

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

Summary of changes:
 test/libraries/common/PMA_showPHPDocu_test.php |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php
index 09cebbf..6b95d4b 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 . '&server=99'
+        $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang
+            . '%2F' . $target . '&server=99&lang=en&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 . '&server=99'
+        $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang
+            . '%2F' . $target . '&server=99&lang=en&token=token"'
             . '" target="documentation">' . __('Documentation') . '</a>]';
 
         $this->assertEquals($expected, PMA_showPHPDocu($target));


hooks/post-receive
-- 
phpMyAdmin