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

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

Revision: 9272
          http://sourceforge.net/p/phpwiki/code/9272
Author:   vargenau
Date:     2014-10-16 09:56:27 +0000 (Thu, 16 Oct 2014)
Log Message:
-----------
Move class imageSet from themes/Hawaiian/lib/random.php to lib/stdlib.php

Modified Paths:
--------------
    trunk/lib/stdlib.php
    trunk/themes/Hawaiian/lib/random.php

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2014-10-16 09:42:51 UTC (rev 9271)
+++ trunk/lib/stdlib.php	2014-10-16 09:56:27 UTC (rev 9272)
@@ -56,6 +56,7 @@
     sort_file_mtime ($a, $b)
     class fileSet {fileSet($directory, $filepattern = false),
                    getFiles($exclude='', $sortby='', $limit='') }
+    class imageSet extends fileSet
 
     glob_to_pcre ($glob)
     glob_match ($glob, $against, $case_sensitive = true)
@@ -1413,6 +1414,18 @@
     }
 }
 
+class imageSet extends fileSet
+{
+    /**
+     * A file is considered an image when the suffix matches one from
+     * INLINE_IMAGES.
+     */
+    function _filenameSelector($filename)
+    {
+        return preg_match("/(" . INLINE_IMAGES . ")$/i", $filename);
+    }
+}
+
 // Convert fileglob to regex style:
 // Convert some wildcards to pcre style, escape the rest
 // Escape . \\ + * ? [ ^ ] $ ( ) { } = ! < > | : /

Modified: trunk/themes/Hawaiian/lib/random.php
===================================================================
--- trunk/themes/Hawaiian/lib/random.php	2014-10-16 09:42:51 UTC (rev 9271)
+++ trunk/themes/Hawaiian/lib/random.php	2014-10-16 09:56:27 UTC (rev 9272)
@@ -31,18 +31,6 @@
     }
 }
 
-class imageSet extends fileSet
-{
-    /**
-     * A file is considered an image when the suffix matches one from
-     * $InlineImages.
-     */
-    function _filenameSelector($filename)
-    {
-        return preg_match("/(" . INLINE_IMAGES . ")$/i", $filename);
-    }
-}
-
 // Local Variables:
 // mode: php
 // tab-width: 8

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