The branch, master has been updated
via 5187db73438c3795e9036ddb03ed9dbc18b8151d (commit)
via 8a3aa86f36df4994c8193f74c019427200a2b873 (commit)
from 82453acc8f4200b66bd4b915cf2064a2f912c0de (commit)
- Log -----------------------------------------------------------------
commit 5187db73438c3795e9036ddb03ed9dbc18b8151d
Author: Michal Čihař <[email protected]>
Date: Thu Jul 21 16:37:32 2011 +0200
The themes path is no longer used here
commit 8a3aa86f36df4994c8193f74c019427200a2b873
Author: Michal Čihař <[email protected]>
Date: Thu Jul 21 16:37:06 2011 +0200
The themes path is no longer used here
-----------------------------------------------------------------------
Summary of changes:
test/libraries/common/PMA_getIcon_test.php | 17 ++++-------------
test/libraries/common/PMA_showDocu_test.php | 7 +------
test/libraries/common/PMA_showPHPDocu_test.php | 3 +--
3 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/test/libraries/common/PMA_getIcon_test.php
b/test/libraries/common/PMA_getIcon_test.php
index b64ef53..1feba0c 100644
--- a/test/libraries/common/PMA_getIcon_test.php
+++ b/test/libraries/common/PMA_getIcon_test.php
@@ -18,7 +18,6 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{
function testGetIconWithoutPropertiesIconic(){
$GLOBALS['cfg']['PropertiesIconic'] = false;
- $GLOBALS['pmaThemeImage'] = 'theme/';
$this->assertEquals('<span class="nowrap"></span>',
PMA_getIcon('b_comment.png') );
@@ -27,21 +26,17 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{
function testGetIconWithPropertiesIconic(){
$GLOBALS['cfg']['PropertiesIconic'] = true;
- $GLOBALS['pmaThemeImage'] = 'theme/';
- $this->assertEquals('<span class="nowrap"><img
src="'.$GLOBALS['pmaThemeImage']
- . 'dot.gif" title="" alt="" class="icon
ic_b_comment" /></span>',
+ $this->assertEquals('<span class="nowrap"><img src="themes/dot.gif"
title="" alt="" class="icon ic_b_comment" /></span>',
PMA_getIcon('b_comment.png') );
}
function testGetIconAlternate(){
$GLOBALS['cfg']['PropertiesIconic'] = true;
- $GLOBALS['pmaThemeImage'] = 'theme/';
$alternate_text = 'alt_str';
- $this->assertEquals('<span class="nowrap"><img
src="'.$GLOBALS['pmaThemeImage']
- .'dot.gif" title="' . $alternate_text . '" alt="'
. $alternate_text
+ $this->assertEquals('<span class="nowrap"><img src="themes/dot.gif"
title="' . $alternate_text . '" alt="' . $alternate_text
. '" class="icon ic_b_comment" /></span>',
PMA_getIcon('b_comment.png',$alternate_text) );
}
@@ -49,11 +44,9 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{
function testGetIconWithContainer(){
$GLOBALS['cfg']['PropertiesIconic'] = true;
- $GLOBALS['pmaThemeImage'] = 'theme/';
$alternate_text = 'alt_str';
- $this->assertEquals('<span class="nowrap"><img
src="'.$GLOBALS['pmaThemeImage']
- .'dot.gif" title="' . $alternate_text . '" alt="'
. $alternate_text
+ $this->assertEquals('<span class="nowrap"><img src="themes/dot.gif"
title="' . $alternate_text . '" alt="' . $alternate_text
. '" class="icon ic_b_comment" /></span>',
PMA_getIcon('b_comment.png',$alternate_text, true)
);
@@ -62,11 +55,9 @@ class PMA_getIcon_test extends PHPUnit_Framework_TestCase{
function testGetIconWithContainerAndForceText(){
$GLOBALS['cfg']['PropertiesIconic'] = true;
- $GLOBALS['pmaThemeImage'] = 'theme/';
$alternate_text = 'alt_str';
- $this->assertEquals('<span class="nowrap"><img
src="'.$GLOBALS['pmaThemeImage']
- .'dot.gif" title="' . $alternate_text . '" alt="'
. $alternate_text
+ $this->assertEquals('<span class="nowrap"><img src="themes/dot.gif"
title="' . $alternate_text . '" alt="' . $alternate_text
. '" class="icon ic_b_comment" /> ' .
$alternate_text . '</span>',
PMA_getIcon('b_comment.png',$alternate_text, true,
true) );
diff --git a/test/libraries/common/PMA_showDocu_test.php
b/test/libraries/common/PMA_showDocu_test.php
index edf7c46..9941c15 100644
--- a/test/libraries/common/PMA_showDocu_test.php
+++ b/test/libraries/common/PMA_showDocu_test.php
@@ -15,17 +15,12 @@ require_once 'libraries/common.lib.php';
class PMA_showDocu_test extends PHPUnit_Framework_TestCase
{
- function setup()
- {
- $GLOBALS['pmaThemeImage'] = 'theme/';
- }
-
function testShowDocuReplaceHelpImg()
{
$GLOBALS['cfg']['ReplaceHelpImg'] = true;
$anchor = "relation";
- $expected = '<a href="Documentation.html#' . $anchor . '"
target="documentation"><img class="icon ic_b_help_s" src="' .
$GLOBALS['pmaThemeImage'] . 'dot.gif" alt="' . __('Documentation') . '"
title="' . __('Documentation') . '" /></a>';
+ $expected = '<a href="Documentation.html#' . $anchor . '"
target="documentation"><img class="icon ic_b_help_s" src="themes/dot.gif"
alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
$this->assertEquals($expected, PMA_showDocu($anchor));
diff --git a/test/libraries/common/PMA_showPHPDocu_test.php
b/test/libraries/common/PMA_showPHPDocu_test.php
index d47269d..a66601d 100644
--- a/test/libraries/common/PMA_showPHPDocu_test.php
+++ b/test/libraries/common/PMA_showPHPDocu_test.php
@@ -21,8 +21,7 @@ class PMA_showPHPDocu_test extends PHPUnit_Framework_TestCase
$target = "docu";
$lang = _pgettext('PHP documentation language', 'en');
- $expected = '<a href="http://php.net/manual/' . $lang . '/' . $target
. '" target="documentation"><img class="icon ic_b_help_s" src="'
- . $GLOBALS['pmaThemeImage'] . 'dot.gif" alt="' .
__('Documentation') . '" title="' . __('Documentation') . '" /></a>';
+ $expected = '<a href="http://php.net/manual/' . $lang . '/' . $target
. '" target="documentation"><img class="icon ic_b_help_s" src="themes/dot.gif"
alt="' . __('Documentation') . '" title="' . __('Documentation') . '" /></a>';
$this->assertEquals($expected, PMA_showPHPDocu($target));
}
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
