[PHP-DOC] cvs: phpdoc /en/reference/errorfunc ini.xml /en/reference/filesystem ini.xml /scripts/iniupdate ini-update.php

[Nuno Lopes]

nlopess         Wed Jul 20 15:10:31 2005 EDT

  Modified files:              
    /phpdoc/en/reference/errorfunc      ini.xml 
    /phpdoc/en/reference/filesystem     ini.xml 
    /phpdoc/scripts/iniupdate   ini-update.php 
  Log:
  fix the regexes for input with special chars
  
http://cvs.php.net/diff.php/phpdoc/en/reference/errorfunc/ini.xml?r1=1.27&r2=1.28&ty=u
Index: phpdoc/en/reference/errorfunc/ini.xml
diff -u phpdoc/en/reference/errorfunc/ini.xml:1.27 
phpdoc/en/reference/errorfunc/ini.xml:1.28
--- phpdoc/en/reference/errorfunc/ini.xml:1.27  Tue Feb 22 12:36:05 2005
+++ phpdoc/en/reference/errorfunc/ini.xml       Wed Jul 20 15:10:28 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.27 $ -->
+<!-- $Revision: 1.28 $ -->
 <section id="errorfunc.configuration">
  &reftitle.runtime;
  &extension.runtime;
@@ -110,6 +110,7 @@
      <entry>warn_plus_overloading</entry>
      <entry>NULL</entry>
      <entry>PHP_INI??</entry>
+     <entry></entry>
     </row>
     </tbody>
    </tgroup>
http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/ini.xml?r1=1.11&r2=1.12&ty=u
Index: phpdoc/en/reference/filesystem/ini.xml
diff -u phpdoc/en/reference/filesystem/ini.xml:1.11 
phpdoc/en/reference/filesystem/ini.xml:1.12
--- phpdoc/en/reference/filesystem/ini.xml:1.11 Sat Mar 26 08:22:31 2005
+++ phpdoc/en/reference/filesystem/ini.xml      Wed Jul 20 15:10:31 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.11 $ -->
+<!-- $Revision: 1.12 $ -->
 <section id="filesystem.configuration">
  &reftitle.runtime;
  &extension.runtime;
@@ -36,8 +36,9 @@
     </row>
      <row>
       <entry>from</entry>
-      <entry>NULL</entry>
-      <entry>??</entry>
+      <entry>""</entry>
+      <entry>PHP_INI_ALL</entry>
+      <entry></entry>
      </row>
      <row>
       <entry>auto_detect_line_endings</entry>
http://cvs.php.net/diff.php/phpdoc/scripts/iniupdate/ini-update.php?r1=1.4&r2=1.5&ty=u
Index: phpdoc/scripts/iniupdate/ini-update.php
diff -u phpdoc/scripts/iniupdate/ini-update.php:1.4 
phpdoc/scripts/iniupdate/ini-update.php:1.5
--- phpdoc/scripts/iniupdate/ini-update.php:1.4 Wed Jul 20 12:42:12 2005
+++ phpdoc/scripts/iniupdate/ini-update.php     Wed Jul 20 15:10:31 2005
@@ -55,14 +55,14 @@
 
                 // create changelog column
                 if (count($val) == 3) {
-                    $file = 
preg_replace("@(<row>\s*$val[0]\s*$val[1](\s*)$val[2])(\s*</row>)@", 
'\1\2<entry></entry>\3', $file);
+                    $file = 
preg_replace("@(<row>\s*$val[0]\s*$val[1](\s*)".preg_quote($val[2]).')(\s*</row>)@',
 '\1\2<entry></entry>\3', $file);
                     $val[3] = '<entry></entry>';
                 }
 
                 // now update the info
                 $entry = substr($val[0], 7, -8);
                 if (isset($info[$entry])) {
-                    $file = 
preg_replace("@(<row>\s*$val[0]\s*)$val[1](\s*)$val[2](\s*)$val[3](\s*</row>)@",
 
"\\1<entry>{$info[$entry]['default']}</entry>\\2<entry>{$info[$entry]['permissions']}</entry>\\3<entry>{$info[$entry]['changelog']}</entry>\\4",
 $file);
+                    $file = 
preg_replace("@(<row>\s*$val[0]\s*)$val[1](\s*)".preg_quote($val[2])."(\s*)$val[3](\s*</row>)@",
 
"\\1<entry>{$info[$entry]['default']}</entry>\\2<entry>{$info[$entry]['permissions']}</entry>\\3<entry>{$info[$entry]['changelog']}</entry>\\4",
 $file);
                 }
             }