[Fusionforge-commits] r11407 - trunk/src/plugins/wiki/www/lib
Marc-Etienne VARGENAU
vargenau at libremir.placard.fr.eu.org
Fri Nov 5 20:31:10 CET 2010
Author: vargenau
Date: 2010-11-05 20:31:10 +0100 (Fri, 05 Nov 2010)
New Revision: 11407
Modified:
trunk/src/plugins/wiki/www/lib/InlineParser.php
Log:
Update from Phpwiki
Modified: trunk/src/plugins/wiki/www/lib/InlineParser.php
===================================================================
--- trunk/src/plugins/wiki/www/lib/InlineParser.php 2010-11-05 16:56:47 UTC (rev 11406)
+++ trunk/src/plugins/wiki/www/lib/InlineParser.php 2010-11-05 19:31:10 UTC (rev 11407)
@@ -1,5 +1,5 @@
<?php
-// rcs_id('$Id: InlineParser.php 7723 2010-11-04 18:20:41Z vargenau $');
+// rcs_id('$Id: InlineParser.php 7726 2010-11-05 15:02:12Z vargenau $');
/* Copyright (C) 2002 Geoffrey T. Dairiki <dairiki at dairiki.org>
* Copyright (C) 2004-2010 Reini Urban
* Copyright (C) 2008-2010 Marc-Etienne Vargenau, Alcatel-Lucent
@@ -354,12 +354,21 @@
// Mediawiki compatibility: allow "Image:" and "File:"
// as synonyms of "Upload:"
- if (string_starts_with($rawlink, "Image:")) {
- $rawlink = str_replace("Image:", "Upload:", $rawlink);
+ // Allow "upload:", "image:" and "file:" also
+ // Remove spaces before and after ":", if any
+ if (string_starts_with($rawlink, "Upload")) {
+ $rawlink = preg_replace("/^Upload\\s*:\\s*/", "Upload:", $rawlink);
+ } else if (string_starts_with($rawlink, "upload")) {
+ $rawlink = preg_replace("/^upload\\s*:\\s*/", "Upload:", $rawlink);
+ } else if (string_starts_with($rawlink, "Image")) {
+ $rawlink = preg_replace("/^Image\\s*:\\s*/", "Upload:", $rawlink);
+ } else if (string_starts_with($rawlink, "image")) {
+ $rawlink = preg_replace("/^image\\s*:\\s*/", "Upload:", $rawlink);
+ } else if (string_starts_with($rawlink, "File")) {
+ $rawlink = preg_replace("/^File\\s*:\\s*/", "Upload:", $rawlink);
+ } else if (string_starts_with($rawlink, "file")) {
+ $rawlink = preg_replace("/^file\\s*:\\s*/", "Upload:", $rawlink);
}
- if (string_starts_with($rawlink, "File:")) {
- $rawlink = str_replace("File:", "Upload:", $rawlink);
- }
$label = UnWikiEscape($label);
/*
@@ -470,7 +479,7 @@
if (empty($label) and isImageLink($link)) {
// if without label => inlined image [File:xx.gif]
$imgurl = $intermap->link($link);
- return LinkImage($imgurl->getAttr('href'), $link);
+ return LinkImage($imgurl->getAttr('href'));
}
return new Cached_InterwikiLink($link, $label);
} else {
More information about the Fusionforge-commits
mailing list