Changeset 369

Show
Ignore:
Timestamp:
02/17/07 17:02:51 (2 years ago)
Author:
laurentj
Message:

updated wikirenderer from 3.0rc1 to 3.0. It fixed also ticket #114

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/lib/wikirenderer/CHANGELOG

    r279 r369  
    11Changelog de WikiRenderer version 3.x 
    22 
    3 Version 3.1 RC1 
     3Version 3.0 
     4 
     5- fix php5 syntax and deprecated properties 
     6- fix bug : error when default rule is used (wrong class name) 
     7- fix bug : callback function for CamelCase word was never called 
     8 
     9Version 3.0 RC1 
    410 
    511- Ajout d'une classe de base pour la configuration 

  • trunk/lib/wikirenderer/WikiRenderer.lib.php

    r279 r369  
    44 * @package WikiRenderer 
    55 * @author Laurent Jouanneau <jouanneau@netcourrier.com> 
    6  * @copyright 2003-2006 Laurent Jouanneau 
     6 * @copyright 2003-2007 Laurent Jouanneau 
    77 * @link http://wikirenderer.berlios.de 
    88 * 
    …… 
    2222 */ 
    2323define('WIKIRENDERER_PATH', dirname(__FILE__).'/'); 
    24 define('WIKIRENDERER_VERSION', '3.0RC1-php5'); 
     24define('WIKIRENDERER_VERSION', '3.0-php5'); 
    2525 
    2626/** 
    …… 
    5454        $this->config = $config; 
    5555        $this->checkWikiWordFunction=$config->checkWikiWordFunction; 
    56         if($config->checkWikiWordFunction === null) $checkWikiWordIn=array(); 
     56        if($config->checkWikiWordFunction === null) $this->checkWikiWordIn=array(); 
    5757        if(count($this->separators)) $this->separator= $this->separators[0]; 
    5858    } 
    …… 
    6868            if(count( $this->checkWikiWordIn) 
    6969                && isset($this->attribute[$this->separatorCount]) 
    70                 && in_array($this->attribute[$this->separatorCount], $this->checkWikiWordIn)) 
     70                && in_array($this->attribute[$this->separatorCount], $this->checkWikiWordIn)){ 
    7171                $parsedContent=$this->_findWikiWord($parsedContent); 
     72            } 
    7273        } 
    7374        $this->contents[$this->separatorCount] .= $parsedContent; 
    …… 
    166167class WikiHtmlTextLine extends WikiTag { 
    167168    public $isTextLineTag=true; 
     169    protected $attribute=array('$$'); 
     170    protected $checkWikiWordIn=array('$$'); 
    168171 
    169172    protected function _doEscape($string){ 
    …… 
    180183   protected $name; 
    181184   protected $attribute=array('$$'); 
     185   protected $checkWikiWordIn=array('$$'); 
    182186 
    183187   public function getContent(){ 
    …… 
    534538      }else{ 
    535539         require_once(WIKIRENDERER_PATH . 'rules/wr3_to_xhtml.php'); 
    536          $this->config= new classicwr_to_xhtml(); 
     540         $this->config= new wr3_to_xhtml(); 
    537541      } 
    538542 
Download in other formats: Unified Diff Zip Archive