summaryrefslogtreecommitdiff
path: root/inc/parser/xhtml.php
diff options
context:
space:
mode:
authorMichal Rezler <rezlemic@fel.cvut.cz>2011-03-23 10:39:45 +0100
committerMichal Rezler <rezlemic@fel.cvut.cz>2011-03-23 10:39:45 +0100
commit35838d22a57707952f630eaf9f9e9ab4c6c3cfb0 (patch)
tree3603e2e56314af40a4b7922e14e52c0bc06f6f9d /inc/parser/xhtml.php
parentc4bb7947fcb2d4a5e5f8a15d9e3bbec333e44e13 (diff)
parentee1214abb2c14cf0f86ff6d9a5b49536c6b01e18 (diff)
downloadrpg-35838d22a57707952f630eaf9f9e9ab4c6c3cfb0.tar.gz
rpg-35838d22a57707952f630eaf9f9e9ab4c6c3cfb0.tar.bz2
jQuery rewrite branch merged into master branch of whole project
Diffstat (limited to 'inc/parser/xhtml.php')
-rw-r--r--inc/parser/xhtml.php21
1 files changed, 14 insertions, 7 deletions
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index 5a3d945d1..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);
@@ -902,16 +902,23 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
// $numrows not yet implemented
- function table_open($maxcols = NULL, $numrows = NULL, $pos){
+ function table_open($maxcols = null, $numrows = null, $pos = null){
global $lang;
// initialize the row counter used for classes
$this->_counter['row_counter'] = 0;
- $this->doc .= '<div class="table ' . $this->startSectionEdit($pos, 'table') . '"><table class="inline">'.DOKU_LF;
+ $class = 'table';
+ if ($pos !== null) {
+ $class .= ' ' . $this->startSectionEdit($pos, 'table');
+ }
+ $this->doc .= '<div class="' . $class . '"><table class="inline">' .
+ DOKU_LF;
}
- function table_close($pos){
+ function table_close($pos = null){
$this->doc .= '</table></div>'.DOKU_LF;
- $this->finishSectionEdit($pos);
+ if ($pos !== null) {
+ $this->finishSectionEdit($pos);
+ }
}
function tablerow_open(){
@@ -1198,4 +1205,4 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
-//Setup VIM: ex: et ts=4 enc=utf-8 :
+//Setup VIM: ex: et ts=4 :