[phpwiki-checkins] SF.net SVN: phpwiki:[7482] trunk/lib

[<ru...@us...>]

Revision: 7482
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7482&view=rev
Author:   rurban
Date:     2010-06-07 13:31:38 +0000 (Mon, 07 Jun 2010)

Log Message:
-----------
fix nasty / escape in regexp

Modified Paths:
--------------
    trunk/lib/FileFinder.php
    trunk/lib/InlineParser.php

Modified: trunk/lib/FileFinder.php
===================================================================
--- trunk/lib/FileFinder.php	2010-06-07 12:14:25 UTC (rev 7481)
+++ trunk/lib/FileFinder.php	2010-06-07 13:31:38 UTC (rev 7482)
@@ -158,7 +158,9 @@
     function _is_abs($path) {
         if (substr($path,0,1) == '/') {
             return true;
-        } elseif (isWindows() and (preg_match('#^[a-z]:[/\\]#i', $path))) {
+        } elseif (isWindows() and preg_match("/^[a-z]:/i", $path)
+                  and (substr($path,3,1) == "/" or substr($path,3,1) == "\\")) 
+        {
             return true;
         } else {
             return false;

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2010-06-07 12:14:25 UTC (rev 7481)
+++ trunk/lib/InlineParser.php	2010-06-07 13:31:38 UTC (rev 7482)
@@ -1,7 +1,7 @@
 <?php 
 // rcs_id('$Id$');
 /* Copyright (C) 2002 Geoffrey T. Dairiki <da...@da...>
- * Copyright (C) 2004-2009 Reini Urban
+ * Copyright (C) 2004-2010 Reini Urban
  * Copyright (C) 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
  *
  * This file is part of PhpWiki.


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