diff options
| -rw-r--r-- | _test/cases/inc/parser/xhtml_links.test.php | 4 | ||||
| -rw-r--r-- | inc/parser/xhtml.php | 4 | ||||
| -rw-r--r-- | lib/tpl/default/rtl.css | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/_test/cases/inc/parser/xhtml_links.test.php b/_test/cases/inc/parser/xhtml_links.test.php index 6a74445b0..0ad96c793 100644 --- a/_test/cases/inc/parser/xhtml_links.test.php +++ b/_test/cases/inc/parser/xhtml_links.test.php @@ -12,7 +12,7 @@ class xhtml_links_test extends UnitTestCase { $p = new Doku_Renderer_xhtml(); $p->emaillink('foo@example.com','<script>alert(\'"alert"\');</script>'); - $expect = '<a href="mailto:foo%20%5Bat%5D%20example%20%5Bdot%5D%20com" class="mail JSnocheck" title="foo [at] example [dot] com"><script>alert('"alert"');</script></a>'; + $expect = '<a href="mailto:foo%20%5Bat%5D%20example%20%5Bdot%5D%20com" class="mail" title="foo [at] example [dot] com"><script>alert('"alert"');</script></a>'; $this->assertEqual($p->doc,$expect); } @@ -36,7 +36,7 @@ class xhtml_links_test extends UnitTestCase { $p = new Doku_Renderer_xhtml(); $p->emaillink('foo@example.com',$image); - $expect = '<a href="mailto:foo%20%5Bat%5D%20example%20%5Bdot%5D%20com" class="media JSnocheck" title="foo [at] example [dot] com"><img src="'.DOKU_BASE.'lib/exe/fetch.php/img.gif?w=10&h=20&cache=nocache" class="media" title="Some Image" alt="Some Image" width="10" height="20" /></a>'; + $expect = '<a href="mailto:foo%20%5Bat%5D%20example%20%5Bdot%5D%20com" class="media" title="foo [at] example [dot] com"><img src="'.DOKU_BASE.'lib/exe/fetch.php/img.gif?w=10&h=20&cache=nocache" class="media" title="Some Image" alt="Some Image" width="10" height="20" /></a>'; $this->assertEqual($p->doc,$expect); } diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php index b0d93f93e..9405d9420 100644 --- a/inc/parser/xhtml.php +++ b/inc/parser/xhtml.php @@ -734,9 +734,9 @@ class Doku_Renderer_xhtml extends Doku_Renderer { $name = $this->_getLinkTitle($name, '', $isImage); if ( !$isImage ) { - $link['class']='mail JSnocheck'; + $link['class']='mail'; } else { - $link['class']='media JSnocheck'; + $link['class']='media'; } $address = $this->_xmlEntities($address); diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css index e40dd966d..82c85839b 100644 --- a/lib/tpl/default/rtl.css +++ b/lib/tpl/default/rtl.css @@ -55,8 +55,7 @@ div.dokuwiki li ol { div.dokuwiki a.urlextern, div.dokuwiki a.interwiki, div.dokuwiki a.windows, -div.dokuwiki a.mail, -div.dokuwiki a.mail.JSnocheck { +div.dokuwiki a.mail { /* should work but doesn't - so we just disable icons here*/ /* background-position: right 1px; |