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

[<var...@us...>]

Revision: 9354
          http://sourceforge.net/p/phpwiki/code/9354
Author:   vargenau
Date:     2014-11-20 18:03:37 +0000 (Thu, 20 Nov 2014)
Log Message:
-----------
Remove PLUGIN_MARKUP_MAP

Modified Paths:
--------------
    trunk/TODO
    trunk/config/config-default.ini
    trunk/lib/IniConfig.php

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2014-11-20 17:56:52 UTC (rev 9353)
+++ trunk/TODO	2014-11-20 18:03:37 UTC (rev 9354)
@@ -9,7 +9,7 @@
 
 short-term TODO:
 * rename should check existing subpages and rename these also.
-* Sidebar: merge AVL theme (internal MonoBook derivate with customizable 
+* Sidebar: merge AVL theme (internal MonoBook derivate with customizable
   box states) with Sidebar
 * clarify issues with pagenames: "," breaks PageList. Escape with "~" or "\"?
   or htmlencode forbidden chars.
@@ -23,7 +23,6 @@
 * Evaluate some xml syntax for plugins (as in MediaWiki): 
   <IncludePages pages=<plugin-list BackLinks/> />
   <BackLink include_self=false />
-4  And/or fix PLUGIN_MARKUP_MAP aliases which break the InlineParser.
 * Fix postgresql stored procedures.
 * Move serialized data from page_data / version_data to separate SQL columns.
 * WikiDB hooks. (?)

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2014-11-20 17:56:52 UTC (rev 9353)
+++ trunk/config/config-default.ini	2014-11-20 18:03:37 UTC (rev 9354)
@@ -153,7 +153,6 @@
 ENABLE_MARKUP_TEMPLATE = true
 DISABLE_MARKUP_WIKIWORD = false
 ENABLE_MARKUP_DIVSPAN = false
-PLUGIN_MARKUP_MAP = ""
 
 ; these not:
 ; DBAUTH_AUTH_DSN =

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2014-11-20 17:56:52 UTC (rev 9353)
+++ trunk/lib/IniConfig.php	2014-11-20 18:03:37 UTC (rev 9354)
@@ -160,7 +160,7 @@
         'PLUGIN_CACHED_DATABASE', 'PLUGIN_CACHED_FILENAME_PREFIX',
         'PLUGIN_CACHED_HIGHWATER', 'PLUGIN_CACHED_LOWWATER', 'PLUGIN_CACHED_MAXLIFETIME',
         'PLUGIN_CACHED_MAXARGLEN', 'PLUGIN_CACHED_IMGTYPES',
-        'WYSIWYG_BACKEND', 'PLUGIN_MARKUP_MAP',
+        'WYSIWYG_BACKEND',
         // extra logic:
         'SERVER_NAME', 'SERVER_PORT', 'SCRIPT_NAME', 'DATA_PATH', 'PHPWIKI_DIR', 'VIRTUAL_PATH',
         'EXTERNAL_HTML2PDF_PAGELIST', 'PLUGIN_CACHED_CACHE_DIR'
@@ -427,21 +427,6 @@
         }
     }
 
-    global $PLUGIN_MARKUP_MAP;
-    $PLUGIN_MARKUP_MAP = array();
-    if (defined('PLUGIN_MARKUP_MAP') and trim(PLUGIN_MARKUP_MAP) != "") {
-        $_map = preg_split('/\s+/', PLUGIN_MARKUP_MAP);
-        foreach ($_map as $v) {
-            list($xml, $plugin) = explode(':', $v);
-            if (!empty($xml) and !empty($plugin))
-                $PLUGIN_MARKUP_MAP[$xml] = $plugin;
-        }
-        unset($_map);
-        unset($xml);
-        unset($plugin);
-        unset($v);
-    }
-
     if (empty($rs['TEMP_DIR'])) {
         $rs['TEMP_DIR'] = "/tmp";
         if (getenv("TEMP"))

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