[phpwiki-checkins] SF.net SVN: phpwiki:[10778] trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 10778
          http://sourceforge.net/p/phpwiki/code/10778
Author:   vargenau
Date:     2021-12-15 09:28:33 +0000 (Wed, 15 Dec 2021)
Log Message:
-----------
Remove ENABLE_XHTML_XML

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/lib/HtmlElement.php
    trunk/lib/IniConfig.php
    trunk/lib/WysiwygEdit/tinymce.php
    trunk/lib/WysiwygEdit.php
    trunk/lib/plugin/AsciiMath.php
    trunk/lib/plugin/AsciiSVG.php
    trunk/locale/it/pgsrc/NoteDiRilascio
    trunk/pgsrc/Help%2FAsciiSVGPlugin
    trunk/pgsrc/ReleaseNotes
    trunk/themes/default/templates/head.tmpl

Modified: trunk/config/config-default.ini
===================================================================

--- trunk/config/config-default.ini	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/config/config-default.ini	2021-12-15 09:28:33 UTC (rev 10778)
@@ -6,7 +6,6 @@
 ENABLE_EDIT_TOOLBAR = true
 JS_SEARCHREPLACE = true
 ENABLE_DOUBLECLICKEDIT = false
-ENABLE_XHTML_XML = false
 ENABLE_OPEN_GRAPH = false
 USECACHE = true
 ISREADONLY = false

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/config/config-dist.ini	2021-12-15 09:28:33 UTC (rev 10778)
@@ -85,11 +85,6 @@
 ; Install e.g. with Homebrew: brew install gnu-units
 ;UNITS_EXE = /usr/local/bin/gunits
 
-; Needed for inlined SVG and MathM, but conflicts with document.write().
-; Experimental. Default: false.
-; See http://hixie.ch/advocacy/xhtml
-;ENABLE_XHTML_XML = true
-
 ; Needed for FacebookLike plugin
 ;ENABLE_OPEN_GRAPH = true
 

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/configurator.php	2021-12-15 09:28:33 UTC (rev 10778)
@@ -453,9 +453,6 @@
 $properties["UNITS_EXE"] =
     new _define_commented_optional('UNITS_EXE');
 
-$properties["ENABLE_XHTML_XML"] =
-    new boolean_define_commented_optional('ENABLE_XHTML_XML');
-
 $properties["ENABLE_OPEN_GRAPH"] =
     new boolean_define_commented_optional('ENABLE_OPEN_GRAPH');
 

Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/HtmlElement.php	2021-12-15 09:28:33 UTC (rev 10778)
@@ -677,9 +677,7 @@
         return HTML(HTML::script($script_args), "\n");
     else
         return HTML(HTML::script($script_args,
-            new RawXml((ENABLE_XHTML_XML ? "\n//<![CDATA[" : "\n<!--//")
-                . "\n" . trim($js) . "\n"
-                . (ENABLE_XHTML_XML ? "//]]>\n" : "// -->"))), "\n");
+            new RawXml("\n<!--//" . "\n" . trim($js) . "\n" . "// -->")), "\n");
 }
 
 /** Conditionally display content based of whether javascript is supported.

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/IniConfig.php	2021-12-15 09:28:33 UTC (rev 10778)
@@ -128,7 +128,7 @@
     // List of all valid config options to be define()d which take booleans.
     $_IC_VALID_BOOL = array
     ('ENABLE_PAGEPERM', 'ENABLE_EDIT_TOOLBAR', 'JS_SEARCHREPLACE',
-        'ENABLE_XHTML_XML', 'ENABLE_DOUBLECLICKEDIT',
+        'ENABLE_DOUBLECLICKEDIT',
         'USECACHE', 'WIKIDB_NOCACHE_MARKUP',
         'ENABLE_REVERSE_DNS', 'ENCRYPTED_PASSWD', 'ZIPDUMP_AUTH',
         'ENABLE_RAW_HTML', 'ENABLE_RAW_HTML_LOCKEDONLY', 'ENABLE_RAW_HTML_SAFE',

Modified: trunk/lib/WysiwygEdit/tinymce.php
===================================================================
--- trunk/lib/WysiwygEdit/tinymce.php	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/WysiwygEdit/tinymce.php	2021-12-15 09:28:33 UTC (rev 10778)
@@ -30,8 +30,6 @@
  * Suggested installation of the jscripts subdirectory
  *   tinymce/jscripts/tiny_mce/ into themes/default/tiny_mce/
  *
- * WARNING! Probably incompatible with ENABLE_XHTML_XML
- *
  * @package WysiwygEdit
  * @author Reini Urban
  */

Modified: trunk/lib/WysiwygEdit.php
===================================================================
--- trunk/lib/WysiwygEdit.php	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/WysiwygEdit.php	2021-12-15 09:28:33 UTC (rev 10778)
@@ -37,8 +37,6 @@
  *       when HtmlParser is finished.
  * Based upon htmlarea3.php and tinymce.php
  *
- * WARNING! Probably incompatible with ENABLE_XHTML_XML (TestMe)
- *
  * @package WysiwygEdit
  * @author Reini Urban
  */

Modified: trunk/lib/plugin/AsciiMath.php
===================================================================
--- trunk/lib/plugin/AsciiMath.php	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/plugin/AsciiMath.php	2021-12-15 09:28:33 UTC (rev 10778)
@@ -27,7 +27,6 @@
 
 /**
  * Render ASCII math as MathML
- * Requires ENABLE_XHTML_XML = true
  * See http://www.jcphysics.com/ASCIIMath/
  * Syntax: http://www1.chapman.edu/~jipsen/mathml/asciimathsyntax.xml
  * Example: "int_-1^1 sqrt(1-x^2)dx = pi/2"

Modified: trunk/lib/plugin/AsciiSVG.php
===================================================================
--- trunk/lib/plugin/AsciiSVG.php	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/lib/plugin/AsciiSVG.php	2021-12-15 09:28:33 UTC (rev 10778)
@@ -24,7 +24,6 @@
 
 /**
  * Interface to http://www1.chapman.edu/~jipsen/svg/asciisvg.html
- * Requires ENABLE_XHTML_XML = true
  * Syntax: http://www1.chapman.edu/~jipsen/svg/asciisvgcommands.html
  */
 

Modified: trunk/locale/it/pgsrc/NoteDiRilascio
===================================================================
--- trunk/locale/it/pgsrc/NoteDiRilascio	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/locale/it/pgsrc/NoteDiRilascio	2021-12-15 09:28:33 UTC (rev 10778)
@@ -1,4 +1,4 @@
-Date: Mon,  6 Dec 2021 12:42:19 +0000
+Date: Wed, 15 Dec 2021 10:20:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=NoteDiRilascio;
@@ -21,6 +21,7 @@
 * Add “Rename” tab in Sidebar theme.
 * Add sample images for ~PhotoAlbum in blog theme
 * Remove EDITING_POLICY
+* Remove ENABLE_XHTML_XML
 * More translations
 
 === Plugins ===

Modified: trunk/pgsrc/Help%2FAsciiSVGPlugin
===================================================================
--- trunk/pgsrc/Help%2FAsciiSVGPlugin	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/pgsrc/Help%2FAsciiSVGPlugin	2021-12-15 09:28:33 UTC (rev 10778)
@@ -1,4 +1,4 @@
-Date: Sat, 20 Feb 2021 11:52:37 +0000
+Date: Wed, 15 Dec 2021 10:20:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAsciiSVGPlugin;
@@ -9,8 +9,6 @@
 The **~AsciiSVGPlugin** [[Help:WikiPlugin|plugin]] is an interface to
 [[http://www1.chapman.edu/~jipsen/svg/asciisvg.html]]
 
-Requires ENABLE_XHTML_XML = true
-
 Syntax: [[http://www1.chapman.edu/~jipsen/svg/asciisvgcommands.html]]
 
 The browser must support SVG in order graphs to be displayed.

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/pgsrc/ReleaseNotes	2021-12-15 09:28:33 UTC (rev 10778)
@@ -1,4 +1,4 @@
-Date: Mon,  6 Dec 2021 12:42:19 +0000
+Date: Wed, 15 Dec 2021 10:20:21 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.6.0)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -21,6 +21,7 @@
 * Add “Rename” tab in Sidebar theme.
 * Add sample images for ~PhotoAlbum in blog theme
 * Remove EDITING_POLICY
+* Remove ENABLE_XHTML_XML
 * More translations
 
 === Plugins ===

Modified: trunk/themes/default/templates/head.tmpl
===================================================================
--- trunk/themes/default/templates/head.tmpl	2021-12-15 08:19:13 UTC (rev 10777)
+++ trunk/themes/default/templates/head.tmpl	2021-12-15 09:28:33 UTC (rev 10778)
@@ -1,9 +1,5 @@
 <head>
-<?php if (ENABLE_XHTML_XML and strstr($request->get('HTTP_ACCEPT'),'application/xhtml+xml')) { ?>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<?php } else { ?>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<?php } ?>
 <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?>
 <meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" />
 <?php if (!empty($PAGE_DESCRIPTION)) { ?>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



