From: Reini U. <ru...@us...> - 2005-10-31 17:20:50
|
Update of /cvsroot/phpwiki/phpwiki/lib In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5720 Modified Files: ErrorManager.php WikiPlugin.php WysiwygEdit.php editpage.php Log Message: fix ConvertBefore Index: ErrorManager.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/ErrorManager.php,v retrieving revision 1.46 retrieving revision 1.47 diff -u -2 -b -p -d -r1.46 -r1.47 --- ErrorManager.php 30 Oct 2005 16:38:13 -0000 1.46 +++ ErrorManager.php 31 Oct 2005 17:20:40 -0000 1.47 @@ -618,4 +618,7 @@ if (!isset($GLOBALS['ErrorManager'])) { // $Log$ +// Revision 1.47 2005/10/31 17:20:40 rurban +// fix ConvertBefore +// // Revision 1.46 2005/10/30 16:38:13 rurban // minor fixes Index: WikiPlugin.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WikiPlugin.php,v retrieving revision 1.60 retrieving revision 1.61 diff -u -2 -b -p -d -r1.60 -r1.61 Index: WysiwygEdit.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/WysiwygEdit.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -2 -b -p -d -r1.2 -r1.3 --- WysiwygEdit.php 31 Oct 2005 16:46:13 -0000 1.2 +++ WysiwygEdit.php 31 Oct 2005 17:20:40 -0000 1.3 @@ -45,9 +45,11 @@ class WysiwygEdit { */ function ConvertBefore($text) { - return asXML(TransformInline($text, 2.0, false)); + require_once("lib/BlockParser.php"); + $xml = TransformText($text, 2.0, $GLOBALS['request']->getArg('pagename')); + return $xml->AsXML(); } /** - * Handler to convert the HTML formatting back to wiki formatting. + * FIXME: Handler to convert the HTML formatting back to wiki formatting. * Derived from InlineParser, but returning wiki text instead of HtmlElement objects. * '<b>text<b>' => '<SPAN style="FONT-WEIGHT: bold">text</SPAN>' => '*text*' @@ -133,4 +135,7 @@ class HtmlTransformer extends InlineTran /* $Log$ + Revision 1.3 2005/10/31 17:20:40 rurban + fix ConvertBefore + Revision 1.2 2005/10/31 16:46:13 rurban move old default transformers to baseclass Index: editpage.php =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/lib/editpage.php,v retrieving revision 1.103 retrieving revision 1.104 diff -u -2 -b -p -d -r1.103 -r1.104 --- editpage.php 31 Oct 2005 17:09:13 -0000 1.103 +++ editpage.php 31 Oct 2005 17:20:40 -0000 1.104 @@ -29,4 +29,5 @@ class PageEditor if (ENABLE_WYSIWYG) { $backend = WYSIWYG_BACKEND; + // TODO: error message require_once("lib/WysiwygEdit/$backend.php"); $class = "WysiwygEdit_$backend"; @@ -341,5 +342,5 @@ class PageEditor * Always: More then 20 new external links * ENABLE_SPAMASSASSIN: content patterns by babycart (only php >= 4.3 for now) - * ENABLE_SPAMBLOCKLIST: IP blacklist, domain blacklist, url patterns + * ENABLE_SPAMBLOCKLIST: content domain blacklist */ function isSpam () { @@ -772,4 +773,7 @@ extends PageEditor /** $Log$ + Revision 1.104 2005/10/31 17:20:40 rurban + fix ConvertBefore + Revision 1.103 2005/10/31 17:09:13 rurban use better constant WYSIWYG_DEFAULT_PAGETYPE_HTML |