[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21533-ga67bd38

[Michal Čihař]

The branch, master has been updated
       via  a67bd381338453d707cf8e89445e12c0bd32af68 (commit)
       via  ebdad5e1c13489d8f8853fcbc703208894ba9544 (commit)
      from  ab651a96b6652bd1cacfc2b4136b3fb75192dfee (commit)


- Log -----------------------------------------------------------------
commit a67bd381338453d707cf8e89445e12c0bd32af68
Author: Michal Čihař <mcihar at suse.cz>
Date:   Mon Oct 24 13:51:58 2011 +0200

    Add testcases for links inside BB code

commit ebdad5e1c13489d8f8853fcbc703208894ba9544
Author: Michal Čihař <mcihar at suse.cz>
Date:   Mon Oct 24 13:51:41 2011 +0200

    Add missing include

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

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

diff --git a/test/classes/PMA_Message_test.php b/test/classes/PMA_Message_test.php
index 405bb75..fa26e84 100644
--- a/test/classes/PMA_Message_test.php
+++ b/test/classes/PMA_Message_test.php
@@ -12,6 +12,7 @@
 require_once 'libraries/sanitizing.lib.php';
 require_once 'libraries/core.lib.php';
 require_once 'libraries/Message.class.php';
+require_once 'libraries/php-gettext/gettext.inc';
 
 class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase
 {
@@ -240,7 +241,10 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase
             array('[i]test[/i][i]aa[i/][em]test[/em]', '<em>test</em><em>aa[i/]<em>test</em>'),
             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 /><sup>test</sup>')
+            array('[kbd]test[/kbd][br][sup]test[/sup]', '<kbd>test</kbd><br /><sup>test</sup>'),
+            array('[a at http://foo.bar/@Documentation]link[/a]', '<a href="./url.php?url=http%3A%2F%2Ffoo.bar%2F" target="Documentation">link</a>'),
+            array('[a at ./non-existing at Documentation]link[/a]', '[a at ./non-existing at Documentation]link</a>'),
+            array('[a at ./Documentation.html at Documentation]link[/a]', '<a href="./Documentation.html" target="Documentation">link</a>'),
         );
     }
 


hooks/post-receive
-- 
phpMyAdmin