The branch, master has been updated via 4bf2927674abbfa2455ee4148ecc63720f73ea8b (commit) from 663958b564bd96a3b8976894e1dce641bf740f52 (commit)

- Log ----------------------------------------------------------------- commit 4bf2927674abbfa2455ee4148ecc63720f73ea8b Author: Michal Čihař mcihar@suse.cz Date: Mon Oct 24 14:24:12 2011 +0200

Force language to be set to avoid problems in jenkins

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

Summary of changes: test/classes/PMA_Message_test.php | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/test/classes/PMA_Message_test.php b/test/classes/PMA_Message_test.php index fa26e84..a14ac96 100644 --- a/test/classes/PMA_Message_test.php +++ b/test/classes/PMA_Message_test.php @@ -242,7 +242,7 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase array('[b]test[/b][strong]test[/strong]', '<strong>test</strong><strong>test</strong>'), array('[tt]test[/tt][code]test[/code]', '<code>test</code><code>test</code>'), array('[kbd]test[/kbd][br][sup]test[/sup]', '<kbd>test</kbd><br />^test'), - array('[a@http://foo.bar/@Documentation%5Dlink%5B/a]', '<a href="./url.php?url=http%3A%2F%2Ffoo.bar%2F" target="Documentation">link</a>'), + array('[a@http://foo.bar/@Documentation%5Dlink%5B/a]', '<a href="./url.php?url=http%3A%2F%2Ffoo.bar%2F&amp;lang=en" target="Documentation">link</a>'), array('[a@./non-existing@Documentation]link[/a]', '[a@./non-existing@Documentation]link</a>'), array('[a@./Documentation.html@Documentation]link[/a]', '<a href="./Documentation.html" target="Documentation">link</a>'), ); @@ -255,6 +255,7 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase

public function testDecodeBB($actual, $expected) { + $GLOBALS['lang'] = 'en'; $this->assertEquals($expected, PMA_Message::decodeBB($actual)); }

hooks/post-receive