onokazu
onoka****@users*****
2005年 6月 9日 (木) 12:20:47 JST
Index: xoops2jp/html/class/module.textsanitizer.php
diff -u xoops2jp/html/class/module.textsanitizer.php:1.2.6.2 xoops2jp/html/class/module.textsanitizer.php:1.2.6.3
--- xoops2jp/html/class/module.textsanitizer.php:1.2.6.2 Mon Jun 6 14:59:39 2005
+++ xoops2jp/html/class/module.textsanitizer.php Thu Jun 9 12:20:46 2005
@@ -1,5 +1,5 @@
<?php
-// $Id: module.textsanitizer.php,v 1.2.6.2 2005/06/06 05:59:39 onokazu Exp $
+// $Id: module.textsanitizer.php,v 1.2.6.3 2005/06/09 03:20:46 onokazu Exp $
// ------------------------------------------------------------------------ //
// XOOPS - PHP Content Management System //
// Copyright (c) 2000 XOOPS.org //
@@ -147,8 +147,6 @@
{
$patterns = array();
$replacements = array();
- //$patterns[] = "/\[code](.*)\[\/code\]/esU";
- //$replacements[] = "'<div class=\"xoopsCode\"><code><pre>'.wordwrap(MyTextSanitizer::htmlSpecialChars('\\1'), 100).'</pre></code></div>'";
// RMV: added new markup for intrasite url (allows easier site moves)
// TODO: automatically convert other URLs to this format if XOOPS_URL matches??
$patterns[] = "/\[siteurl=(['\"]?)([^\"'<>]*)\\1](.*)\[\/siteurl\]/sU";
@@ -401,11 +399,11 @@
$patterns = "/\[code](.*)\[\/code\]/esU";
if ($image != 0) {
// image allowed
- $replacements = "'<div class=\"xoopsCode\"><code><pre>'.MyTextSanitizer::codeSanitizer('$1').'</pre></code></div>'";
+ $replacements = "'<div class=\"xoopsCode\"><pre><code>'.MyTextSanitizer::codeSanitizer('$1').'</code></pre></div>'";
//$text =& $this->xoopsCodeDecode($text);
} else {
// image not allowed
- $replacements = "'<div class=\"xoopsCode\"><code><pre>'.MyTextSanitizer::codeSanitizer('$1', 0).'</pre></code></div>'";
+ $replacements = "'<div class=\"xoopsCode\"><pre><code>'.MyTextSanitizer::codeSanitizer('$1', 0).'</code></pre></div>'";
//$text =& $this->xoopsCodeDecode($text, 0);
}
$text = preg_replace($patterns, $replacements, $text);