Minahito
minah****@users*****
2007年 4月 26日 (木) 13:27:06 JST
Index: xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php
diff -u xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php:1.1.2.4.2.1 xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php:1.1.2.4.2.2
--- xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php:1.1.2.4.2.1 Mon Apr 23 22:30:58 2007
+++ xoops2jp/html/modules/legacy/kernel/Legacy_TextFilter.class.php Thu Apr 26 13:27:06 2007
@@ -1,7 +1,7 @@
<?php
/**
* @package Legacy
- * @version $Id: Legacy_TextFilter.class.php,v 1.1.2.4.2.1 2007/04/23 13:30:58 nobunobu Exp $
+ * @version $Id: Legacy_TextFilter.class.php,v 1.1.2.4.2.2 2007/04/26 04:27:06 minahito Exp $
*/
if (!defined('XOOPS_ROOT_PATH')) exit();
@@ -59,23 +59,23 @@
function Legacy_TextFilter() {
$this->mMakeClickableConvertTable =& new XCube_Delegate;
$this->mMakeClickableConvertTable->register('Legacy_TextFilter.MakeClickableConvertTable');
- $this->mMakeClickableConvertTable->add('Legacy_TextFilter::MakeClickableConvertTable', XCUBE_DELEGATE_PRIORITY_FIRST);
+ $this->mMakeClickableConvertTable->add('Legacy_TextFilter::MakeClickableConvertTable', XCUBE_DELEGATE_PRIORITY_2);
$this->mMakeXCodeConvertTable =& new XCube_Delegate;
$this->mMakeXCodeConvertTable->register('Legacy_TextFilter.MakeXCodeConvertTable');
- $this->mMakeXCodeConvertTable->add('Legacy_TextFilter::MakeXCodeConvertTable', XCUBE_DELEGATE_PRIORITY_FIRST);
+ $this->mMakeXCodeConvertTable->add('Legacy_TextFilter::MakeXCodeConvertTable', XCUBE_DELEGATE_PRIORITY_2);
$this->mMakeXCodeCheckImgPatterns =& new XCube_Delegate;
$this->mMakeXCodeCheckImgPatterns->register('Legacy_TextFilter.MakeXCodeCheckImgPatterns');
- $this->mMakeXCodeCheckImgPatterns->add('Legacy_TextFilter::MakeXCodeCheckImgPatterns', XCUBE_DELEGATE_PRIORITY_FIRST);
+ $this->mMakeXCodeCheckImgPatterns->add('Legacy_TextFilter::MakeXCodeCheckImgPatterns', XCUBE_DELEGATE_PRIORITY_2);
$this->mMakePreXCodeConvertTable =& new XCube_Delegate;
$this->mMakePreXCodeConvertTable->register('Legacy_TextFilter.MakePreXCodeConvertTable');
- $this->mMakePreXCodeConvertTable->add('Legacy_TextFilter::MakePreXCodeConvertTable', XCUBE_DELEGATE_PRIORITY_FIRST);
+ $this->mMakePreXCodeConvertTable->add('Legacy_TextFilter::MakePreXCodeConvertTable', XCUBE_DELEGATE_PRIORITY_2);
$this->mMakePostXCodeConvertTable =& new XCube_Delegate;
$this->mMakePostXCodeConvertTable->register('Legacy_TextFilter.MakePostXCodeConvertTable');
- $this->mMakePostXCodeConvertTable->add('Legacy_TextFilter::MakePostXCodeConvertTable', XCUBE_DELEGATE_PRIORITY_FINAL);
+ $this->mMakePostXCodeConvertTable->add('Legacy_TextFilter::MakePostXCodeConvertTable', XCUBE_DELEGATE_PRIORITY_2);
//@deprecated
//Todo: For keeping compatible with XC2.1 Beta3
@@ -283,7 +283,7 @@
$replacements[0][] = $replacements[1][] = '<a href="http://\\2" target="_blank">\\3</a>';
$patterns[] = "/\[color=(['\"]?)([a-zA-Z0-9]*)\\1](.*)\[\/color\]/sU";
$replacements[0][] = $replacements[1][] = '<span style="color: #\\2;">\\3</span>';
- $patterns[] = "/\[size=(['\"]?)([a-z0-9-]*)\\1](.*)\[\/size\]/sU";
+ $patterns[] = "/\[size=(['\"]?)([a-z]*)\\1](.*)\[\/size\]/sU";
$replacements[0][] = $replacements[1][] = '<span style="font-size: \\2;">\\3</span>';
$patterns[] = "/\[font=(['\"]?)([^;<>\*\(\)\"']*)\\1](.*)\[\/font\]/sU";
$replacements[0][] = $replacements[1][] = '<span style="font-family: \\2;">\\3</span>';