Menu
▾
▴
[phpwiki-checkins] SF.net SVN: phpwiki:[7215] trunk
|
From: <var...@us...> - 2009-10-17 15:14:11
|
Revision: 7215
http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7215&view=rev
Author: vargenau
Date: 2009-10-17 15:14:00 +0000 (Sat, 17 Oct 2009)
Log Message:
-----------
ENABLE_MARKUP_TEMPLATE removed, it had to be true so that Wikicreole syntax for images work
Modified Paths:
--------------
trunk/config/config-default.ini
trunk/config/config-dist.ini
trunk/configurator.php
trunk/g
trunk/lib/BlockParser.php
trunk/lib/IniConfig.php
trunk/lib/InlineParser.php
trunk/lib/plugin/Template.php
trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
trunk/themes/MonoBook/themeinfo.php
Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini 2009-10-17 14:53:36 UTC (rev 7214)
+++ trunk/config/config-default.ini 2009-10-17 15:14:00 UTC (rev 7215)
@@ -152,7 +152,6 @@
TOC_FULL_SYNTAX = true
ENABLE_MARKUP_COLOR = true
-ENABLE_MARKUP_TEMPLATE = false
DISABLE_MARKUP_WIKIWORD = false
ENABLE_MARKUP_DIVSPAN = false
PLUGIN_MARKUP_MAP = ""
Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini 2009-10-17 14:53:36 UTC (rev 7214)
+++ trunk/config/config-dist.ini 2009-10-17 15:14:00 UTC (rev 7215)
@@ -1039,10 +1039,6 @@
; Default: true
;ENABLE_MARKUP_COLOR = false
-; Enable Mediawiki-style {{TemplatePage|vars=value|...}} syntax.
-; Default: undefined. Enabled automatically on the MonoBook theme if undefined.
-;ENABLE_MARKUP_TEMPLATE = true
-
; Disable automatic linking of camelcase (wiki-)words to pages.
; Internal page links must be forced with [ pagename ] then.
; Default: false
Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php 2009-10-17 14:53:36 UTC (rev 7214)
+++ trunk/configurator.php 2009-10-17 15:14:00 UTC (rev 7215)
@@ -1432,9 +1432,6 @@
$properties["ENABLE_MARKUP_COLOR"] =
new boolean_define_optional('ENABLE_MARKUP_COLOR');
-$properties["ENABLE_MARKUP_TEMPLATE"] =
-new boolean_define_optional('ENABLE_MARKUP_TEMPLATE');
-
$properties["DISABLE_MARKUP_WIKIWORD"] =
new boolean_define_optional('DISABLE_MARKUP_WIKIWORD');
Modified: trunk/g
===================================================================
--- trunk/g 2009-10-17 14:53:36 UTC (rev 7214)
+++ trunk/g 2009-10-17 15:14:00 UTC (rev 7215)
@@ -107,9 +107,6 @@
// Allow ".jpeg" as extension
define('INLINE_IMAGES', 'png|jpg|jpeg|gif');
- // Allow template with MediaWiki syntax
- define('ENABLE_MARKUP_TEMPLATE', true);
-
// Allow parsing of headers for CreateToc
define('TOC_FULL_SYNTAX', true);
Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php 2009-10-17 14:53:36 UTC (rev 7214)
+++ trunk/lib/BlockParser.php 2009-10-17 15:14:00 UTC (rev 7215)
@@ -1115,6 +1115,17 @@
}
}
+/**
+ * Template syntax similar to Mediawiki
+ * {{template}}
+ * => < ? plugin Template page=template ? >
+ * {{template|var1=value1|var2=value|...}}
+ * => < ? plugin Template page=template var=value ... ? >
+ *
+ * The {{...}} syntax is also used for:
+ * - Wikicreole images
+ * - videos
+ */
class Block_template_plugin extends Block_pre
{
var $_re = '{{';
Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php 2009-10-17 14:53:36 UTC (rev 7214)
+++ trunk/lib/IniConfig.php 2009-10-17 15:14:00 UTC (rev 7215)
@@ -197,7 +197,7 @@
'BLOG_DEFAULT_EMPTY_PREFIX', 'DATABASE_PERSISTENT',
'ENABLE_DISCUSSION_LINK', 'ENABLE_CAPTCHA',
'ENABLE_WYSIWYG', 'WYSIWYG_DEFAULT_PAGETYPE_HTML',
- 'DISABLE_MARKUP_WIKIWORD', 'ENABLE_MARKUP_COLOR', 'ENABLE_MARKUP_TEMPLATE',
+ 'DISABLE_MARKUP_WIKIWORD', 'ENABLE_MARKUP_COLOR',
'ENABLE_MARKUP_DIVSPAN', 'USE_BYTEA', 'UPLOAD_USERDIR', 'DISABLE_UNITS',
'ENABLE_SEARCHHIGHLIGHT', 'DISABLE_UPLOAD_ONLY_ALLOWED_EXTENSIONS',
'ENABLE_AUTH_OPENID', 'INSECURE_ACTIONS_LOCALHOST_ONLY',
Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php 2009-10-17 14:53:36 UTC (rev 7214)
+++ trunk/lib/InlineParser.php 2009-10-17 15:14:00 UTC (rev 7215)
@@ -1003,12 +1003,17 @@
}
}
-/** ENABLE_MARKUP_TEMPLATE
+/**
* Template syntax similar to Mediawiki
* {{template}}
* => < ? plugin Template page=template ? >
* {{template|var1=value1|var2=value|...}}
* => < ? plugin Template page=template var=value ... ? >
+ *
+ * The {{...}} syntax is also used for:
+ * - Wikicreole images
+ * - videos
+ * - predefined icons
*/
class Markup_template_plugin extends SimpleMarkup
{
Modified: trunk/lib/plugin/Template.php
===================================================================
--- trunk/lib/plugin/Template.php 2009-10-17 14:53:36 UTC (rev 7214)
+++ trunk/lib/plugin/Template.php 2009-10-17 15:14:00 UTC (rev 7215)
@@ -2,6 +2,7 @@
rcs_id('$Id$');
/*
Copyright 2005,2007 $ThePhpWikiProgrammingTeam
+ Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
This file is part of PhpWiki.
@@ -47,9 +48,7 @@
* <includeonly> .. </includeonly> is only expanded in pages using the template,
* not in the template itself.
*
- * See also:
- * - ENABLE_MARKUP_TEMPLATE = true: (lib/InlineParser.php)
- * Support a mediawiki-style syntax extension which maps
+ * We support a mediawiki-style syntax extension which maps
* {{TemplateFilm|title=Some Good Film|year=1999}}
* to
* <?plugin Template page=TemplateFilm vars="title=Some Good Film&year=1999" ?>
Modified: trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin
===================================================================
--- trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2009-10-17 14:53:36 UTC (rev 7214)
+++ trunk/locale/de/pgsrc/Hilfe%2FVorlagePlugin 2009-10-17 15:14:00 UTC (rev 7215)
@@ -1,4 +1,4 @@
-Date: Sun, 5 Jul 2009 21:04:20 +0000
+Date: Sat, 17 Oct 2009 17:03:32 +0000
Mime-Version: 1.0 (Produced by PhpWiki 1.3.13)
X-Rcs-Id: $Id$
Content-Type: application/x-phpwiki;
@@ -60,7 +60,6 @@
<noinclude> .. </noinclude> is stripped
==== In work:
-* ENABLE_MARKUP_TEMPLATE = true: (lib/InlineParser.php)
Support a mediawiki-style syntax extension which maps
{{{
{{Template/Film|title=Some Good Film|year=1999}}
Modified: trunk/themes/MonoBook/themeinfo.php
===================================================================
--- trunk/themes/MonoBook/themeinfo.php 2009-10-17 14:53:36 UTC (rev 7214)
+++ trunk/themes/MonoBook/themeinfo.php 2009-10-17 15:14:00 UTC (rev 7215)
@@ -18,8 +18,6 @@
*/
require_once('lib/WikiTheme.php');
require_once('themes/wikilens/themeinfo.php');
-if (!defined("ENABLE_MARKUP_TEMPLATE"))
- define("ENABLE_MARKUP_TEMPLATE", true);
function ActionButton ($action, $label = false, $page_or_rev = false, $options = false) {
global $WikiTheme;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
