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

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

Revision: 7457
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7457&view=rev
Author:   vargenau
Date:     2010-05-31 13:23:56 +0000 (Mon, 31 May 2010)

Log Message:
-----------
Remove pcre_fix_posix_classes function

Modified Paths:
--------------
    trunk/lib/CachedMarkup.php
    trunk/lib/IniConfig.php
    trunk/lib/config.php
    trunk/lib/stdlib.php

Modified: trunk/lib/CachedMarkup.php
===================================================================
--- trunk/lib/CachedMarkup.php	2010-05-31 13:15:22 UTC (rev 7456)
+++ trunk/lib/CachedMarkup.php	2010-05-31 13:23:56 UTC (rev 7457)
@@ -176,9 +176,9 @@
     function _glean_description($text) {
         static $two_sentences;
         if (!$two_sentences) {
-            $two_sentences = pcre_fix_posix_classes("[.?!][\")]*\s+[\"(]*[[:upper:])]"
-                                                    . ".*"
-                                                    . "[.?!][\")]*\s*[\"(]*([[:upper:])]|$)");
+            $two_sentences = "[.?!][\")]*\s+[\"(]*[[:upper:])]"
+                           . ".*"
+                           . "[.?!][\")]*\s*[\"(]*([[:upper:])]|$)";
         }
         
         if (!isset($this->_description) and preg_match("/$two_sentences/sx", $text))

Modified: trunk/lib/IniConfig.php
===================================================================
--- trunk/lib/IniConfig.php	2010-05-31 13:15:22 UTC (rev 7456)
+++ trunk/lib/IniConfig.php	2010-05-31 13:23:56 UTC (rev 7457)
@@ -56,8 +56,7 @@
  *
  * - Get rid of WikiNameRegexp and KeywordLinkRegexp as globals by finding
  *   everywhere that uses them as variables and modify the code to use
- *   them as constants. Will involve hacking around
- *   pcre_fix_posix_classes (probably with redefines()).
+ *   them as constants.
  */
 
 include_once (dirname(__FILE__)."/config.php");
@@ -969,8 +968,6 @@
     }
 
     // language dependent updates:
-    $WikiNameRegexp = pcre_fix_posix_classes($WikiNameRegexp);
-    //if ($KeywordLinkRegexp) $KeywordLinkRegexp = pcre_fix_posix_classes($KeywordLinkRegexp);
     if (!defined('CATEGORY_GROUP_PAGE'))
         define('CATEGORY_GROUP_PAGE',_("CategoryGroup"));
     if (!defined('WIKI_NAME'))

Modified: trunk/lib/config.php
===================================================================
--- trunk/lib/config.php	2010-05-31 13:15:22 UTC (rev 7456)
+++ trunk/lib/config.php	2010-05-31 13:23:56 UTC (rev 7457)
@@ -277,10 +277,6 @@
     return $loc;
 }
 
-function pcre_fix_posix_classes ($regexp) {
-    return $regexp;
-}
-
 function deduce_script_name() {
     $s = &$GLOBALS['HTTP_SERVER_VARS'];
     $script = @$s['SCRIPT_NAME'];

Modified: trunk/lib/stdlib.php
===================================================================
--- trunk/lib/stdlib.php	2010-05-31 13:15:22 UTC (rev 7456)
+++ trunk/lib/stdlib.php	2010-05-31 13:23:56 UTC (rev 7457)
@@ -1280,7 +1280,7 @@
         $RE[] = "/(${sep})([^${sep}]+)/";
         
         foreach ($RE as $key)
-            $RE[$key] = pcre_fix_posix_classes($key);
+            $RE[$key] = $key;
     }
 
     foreach ($RE as $regexp) {


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