[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5-20532-gaa4dac8

[Madhura Jayaratne]

The branch, master has been updated
       via  aa4dac81752c6c8d84838f098501fb9770735d73 (commit)
       via  383d55ff6dd5d179212ccaaa3b734396694f0c9e (commit)
      from  7bb14bcea9affb0c43076685f049e45719384d4d (commit)


- Log -----------------------------------------------------------------
commit aa4dac81752c6c8d84838f098501fb9770735d73
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Sun Oct 2 02:10:15 2011 +0530

    Defining undefined config

commit 383d55ff6dd5d179212ccaaa3b734396694f0c9e
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Sun Oct 2 02:07:36 2011 +0530

    Revert 7bb14bcea9affb0c43076685f049e45719384d4d

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

Summary of changes:
 test/libraries/common/PMA_showPHPDocu_test.php |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/libraries/common/PMA_showPHPDocu_test.php b/test/libraries/common/PMA_showPHPDocu_test.php
index 15f8b11..09cebbf 100644
--- a/test/libraries/common/PMA_showPHPDocu_test.php
+++ b/test/libraries/common/PMA_showPHPDocu_test.php
@@ -11,7 +11,6 @@
 /*
  * Include to test.
  */
-require_once 'libraries/config.default.php';
 require_once 'libraries/core.lib.php';
 require_once 'libraries/common.lib.php';
 require_once 'libraries/Theme.class.php';
@@ -21,6 +20,8 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
     function setup()
     {
         $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
+        $GLOBALS['server'] = 99;
+        $GLOBALS['cfg']['ServerDefault'] = 0;
     }
 
     function testShwoPHPDocuReplaceHelpImg()
@@ -29,7 +30,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
+        $expected = '<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '&server=99'
             . '" target="documentation"><img src="themes/dot.gif" title="'
             . __('Documentation') . '" alt="' . __('Documentation') . '" class="icon ic_b_help" /></a>';
 
@@ -42,7 +43,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
+        $expected = '[<a href="./url.php?url=http%3A%2F%2Fphp.net%2Fmanual%2F' . $lang . '%2F' . $target . '&server=99'
             . '" target="documentation">' . __('Documentation') . '</a>]';
 
         $this->assertEquals($expected, PMA_showPHPDocu($target));


hooks/post-receive
-- 
phpMyAdmin