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

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

Revision: 8518
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8518&view=rev
Author:   vargenau
Date:     2012-11-21 20:50:11 +0000 (Wed, 21 Nov 2012)
Log Message:
-----------
Add swf to INLINE_IMAGES

Modified Paths:
--------------
    trunk/config/config-default.ini
    trunk/config/config-dist.ini
    trunk/configurator.php
    trunk/lib/stdlib.php

Modified: trunk/config/config-default.ini
===================================================================
--- trunk/config/config-default.ini	2012-11-21 14:13:25 UTC (rev 8517)
+++ trunk/config/config-default.ini	2012-11-21 20:50:11 UTC (rev 8518)
@@ -135,7 +135,7 @@
 DEFAULT_WIKI_PAGES = "ReleaseNotes"
 
 ALLOWED_PROTOCOLS = "http|https|mailto|ftp|news|nntp|ssh|gopher"
-INLINE_IMAGES = "png|jpg|jpeg|gif"
+INLINE_IMAGES = "png|jpg|jpeg|gif|swf"
 WIKI_NAME_REGEXP = "(?<![[:alnum:]])(?:[[:upper:]][[:lower:][:digit:]]+){2,}(?![[:alnum:]])"
 SUBPAGE_SEPARATOR = "/"
 INTERWIKI_MAP_FILE = lib/interwiki.map

Modified: trunk/config/config-dist.ini
===================================================================
--- trunk/config/config-dist.ini	2012-11-21 14:13:25 UTC (rev 8517)
+++ trunk/config/config-dist.ini	2012-11-21 20:50:11 UTC (rev 8518)
@@ -981,7 +981,7 @@
 ; which will create embedded object instead of img. 
 ; Typical CGI extensions as pl or cgi maybe allowed too, 
 ; but those two will be enforced to img.
-;INLINE_IMAGES = "png|jpg|jpeg|gif"
+;INLINE_IMAGES = "png|jpg|jpeg|gif|swf"
 
 ; Perl regexp for WikiNames ("bumpy words"):
 ;   (?<!..) & (?!...) used instead of '\b' because \b matches '_' as well

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2012-11-21 14:13:25 UTC (rev 8517)
+++ trunk/configurator.php	2012-11-21 20:50:11 UTC (rev 8518)
@@ -1411,7 +1411,7 @@
 within a named link [name|uri] one more protocol is defined: phpwiki");
 
 $properties["Inline Images"] =
-    new list_define('INLINE_IMAGES', 'png|jpg|jpeg|gif');
+    new list_define('INLINE_IMAGES', 'png|jpg|jpeg|gif|swf');
 
 $properties["WikiName Regexp"] =
     new _define('WIKI_NAME_REGEXP', "(?<![[:alnum:]])(?:[[:upper:]][[:lower:]]+){2,}(?![[:alnum:]])", "

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2012-11-21 14:13:25 UTC (rev 8517)
+++ trunk/lib/stdlib.php	2012-11-21 20:50:11 UTC (rev 8518)
@@ -2540,7 +2540,7 @@
 
 /**
  * Returns true if the filename ends with an image suffix.
- * Uses INLINE_IMAGES if defined, else "png|jpg|jpeg|gif"
+ * Uses INLINE_IMAGES if defined, else "png|jpg|jpeg|gif|swf"
  */
 function is_image($filename)
 {
@@ -2548,7 +2548,7 @@
     if (defined('INLINE_IMAGES')) {
         $inline_images = INLINE_IMAGES;
     } else {
-        $inline_images = "png|jpg|jpeg|gif";
+        $inline_images = "png|jpg|jpeg|gif|swf";
     }
 
     foreach (explode("|", $inline_images) as $suffix) {

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