[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-11133-g8e511c1

[Michal Čihař]

The branch, master has been updated
       via  8e511c16ff125c36dd27ceab0e1f93013bd81d75 (commit)
      from  578bb63d76378363bc7f10443dc6cde80d24171f (commit)


- Log -----------------------------------------------------------------
commit 8e511c16ff125c36dd27ceab0e1f93013bd81d75
Author: Michal Čihař <mcihar at suse.cz>
Date:   Thu Jul 21 11:47:00 2011 +0200

    I've simplified this too much
    
    Each test needs different params.

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

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

diff --git a/test/libraries/common/PMA_showDocu_test.php b/test/libraries/common/PMA_showDocu_test.php
index a0c12c4..b11f12d 100644
--- a/test/libraries/common/PMA_showDocu_test.php
+++ b/test/libraries/common/PMA_showDocu_test.php
@@ -17,12 +17,13 @@ class PMA_showDocu_test extends PHPUnit_Framework_TestCase
 {
     function setup()
     {
-        $GLOBALS['cfg']['ReplaceHelpImg'] = true;
         $GLOBALS['pmaThemeImage'] = 'theme/';
     }
 
     function testShowDocuReplaceHelpImg()
     {
+        $GLOBALS['cfg']['ReplaceHelpImg'] = true;
+
         $anchor = "relation";
         $expected = '<a href="Documentation.html#' . $anchor . '" target="documentation"><img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
 
@@ -32,6 +33,8 @@ class PMA_showDocu_test extends PHPUnit_Framework_TestCase
 
     function testShowDocuNotReplaceHelpImg()
     {
+        $GLOBALS['cfg']['ReplaceHelpImg'] = false;
+
         $anchor = "relation";
         $expected = '[<a href="Documentation.html#' . $anchor . '" target="documentation">' . __('Documentation') . '</a>]';
 


hooks/post-receive
-- 
phpMyAdmin