svn: /phpdoc/en/trunk/reference/pcre/ functions/preg-filter.xml functions/preg-grep.xml functions/preg-match-all.xml functions/preg-match.xml
functions/preg-replace-callback.xml functions/preg-replace.xml functions/preg-split.xml pattern.modifiers.xml

From: Date: Tue, 25 Jan 2011 19:10:19 +0000
Subject: svn: /phpdoc/en/trunk/reference/pcre/ functions/preg-filter.xml functions/preg-grep.xml functions/preg-match-all.xml functions/preg-match.xml
functions/preg-replace-callback.xml functions/preg-replace.xml functions/preg-split.xml pattern.modifiers.xml
Groups: php.doc.cvs 
Request: Send a blank email to doc-cvs+get-7671@lists.php.net to get a copy of this message
philip Tue, 25 Jan 2011 19:10:19 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=307739 Log: - Added PCRE modifier link to 'See Also' section of relevant PCRE functions - Moved the 'e' tip from preg_replace to the modifier documentation, and added link instead of 'e' docs - Closes PHP Bug #53546 Bug: http://bugs.php.net/53546 (Open) Give reference to PCRE pattern modifiers page Changed paths: U phpdoc/en/trunk/reference/pcre/functions/preg-filter.xml U phpdoc/en/trunk/reference/pcre/functions/preg-grep.xml U phpdoc/en/trunk/reference/pcre/functions/preg-match-all.xml U phpdoc/en/trunk/reference/pcre/functions/preg-match.xml U phpdoc/en/trunk/reference/pcre/functions/preg-replace-callback.xml U phpdoc/en/trunk/reference/pcre/functions/preg-replace.xml U phpdoc/en/trunk/reference/pcre/functions/preg-split.xml U phpdoc/en/trunk/reference/pcre/pattern.modifiers.xml Modified: phpdoc/en/trunk/reference/pcre/functions/preg-filter.xml =================================================================== --- phpdoc/en/trunk/reference/pcre/functions/preg-filter.xml 2011-01-25 18:43:31 UTC (rev 307738) +++ phpdoc/en/trunk/reference/pcre/functions/preg-filter.xml 2011-01-25 19:10:19 UTC (rev 307739) @@ -95,6 +95,7 @@ &reftitle.seealso; <para> <simplelist> + <member><link linkend="pcre.pattern">PCRE Patterns</link></member> <member><function>preg_replace</function></member> <member><function>preg_replace_callback</function></member> <member><function>preg_grep</function></member> Modified: phpdoc/en/trunk/reference/pcre/functions/preg-grep.xml =================================================================== --- phpdoc/en/trunk/reference/pcre/functions/preg-grep.xml 2011-01-25 18:43:31 UTC (rev 307738) +++ phpdoc/en/trunk/reference/pcre/functions/preg-grep.xml 2011-01-25 19:10:19 UTC (rev 307739) @@ -124,6 +124,7 @@ &reftitle.seealso; <para> <simplelist> + <member><link linkend="pcre.pattern">PCRE Patterns</link></member> <member><function>preg_match_all</function></member> <member><function>preg_filter</function></member> <member><function>preg_last_error</function></member> Modified: phpdoc/en/trunk/reference/pcre/functions/preg-match-all.xml =================================================================== --- phpdoc/en/trunk/reference/pcre/functions/preg-match-all.xml 2011-01-25 18:43:31 UTC (rev 307738) +++ phpdoc/en/trunk/reference/pcre/functions/preg-match-all.xml 2011-01-25 19:10:19 UTC (rev 307739) @@ -357,6 +357,7 @@ &reftitle.seealso; <para> <simplelist> + <member><link linkend="pcre.pattern">PCRE Patterns</link></member> <member><function>preg_match</function></member> <member><function>preg_replace</function></member> <member><function>preg_split</function></member> Modified: phpdoc/en/trunk/reference/pcre/functions/preg-match.xml =================================================================== --- phpdoc/en/trunk/reference/pcre/functions/preg-match.xml 2011-01-25 18:43:31 UTC (rev 307738) +++ phpdoc/en/trunk/reference/pcre/functions/preg-match.xml 2011-01-25 19:10:19 UTC (rev 307739) @@ -330,6 +330,7 @@ &reftitle.seealso; <para> <simplelist> + <member><link linkend="pcre.pattern">PCRE Patterns</link></member> <member><function>preg_match_all</function></member> <member><function>preg_replace</function></member> <member><function>preg_split</function></member> Modified: phpdoc/en/trunk/reference/pcre/functions/preg-replace-callback.xml =================================================================== --- phpdoc/en/trunk/reference/pcre/functions/preg-replace-callback.xml 2011-01-25 18:43:31 UTC (rev 307738) +++ phpdoc/en/trunk/reference/pcre/functions/preg-replace-callback.xml 2011-01-25 19:10:19 UTC (rev 307739) @@ -229,6 +229,7 @@ &reftitle.seealso; <para> <simplelist> + <member><link linkend="pcre.pattern">PCRE Patterns</link></member> <member><function>preg_replace</function></member> <member><function>preg_last_error</function></member> <member><function>create_function</function></member> Modified: phpdoc/en/trunk/reference/pcre/functions/preg-replace.xml =================================================================== --- phpdoc/en/trunk/reference/pcre/functions/preg-replace.xml 2011-01-25 18:43:31 UTC (rev 307738) +++ phpdoc/en/trunk/reference/pcre/functions/preg-replace.xml 2011-01-25 19:10:19 UTC (rev 307739) @@ -35,12 +35,9 @@ strings. </para> <para> - The <literal>e</literal> modifier makes <function>preg_replace</function> - treat the <parameter>replacement</parameter> parameter as PHP code after - the appropriate references substitution is done. Tip: make sure that - <parameter>replacement</parameter> constitutes a valid PHP code string, - otherwise PHP will complain about a parse error at the line containing - <function>preg_replace</function>. + Several <link linkend="reference.pcre.pattern.modifiers">PCRE modifiers</link> + are also available, including '<literal>e</literal>' (PREG_REPLACE_EVAL), which + is specific to this function. </para> </listitem> </varlistentry> @@ -351,6 +348,7 @@ &reftitle.seealso; <para> <simplelist> + <member><link linkend="pcre.pattern">PCRE Patterns</link></member> <member><function>preg_filter</function></member> <member><function>preg_match</function></member> <member><function>preg_replace_callback</function></member> Modified: phpdoc/en/trunk/reference/pcre/functions/preg-split.xml =================================================================== --- phpdoc/en/trunk/reference/pcre/functions/preg-split.xml 2011-01-25 18:43:31 UTC (rev 307738) +++ phpdoc/en/trunk/reference/pcre/functions/preg-split.xml 2011-01-25 19:10:19 UTC (rev 307739) @@ -222,6 +222,7 @@ &reftitle.seealso; <para> <simplelist> + <member><link linkend="pcre.pattern">PCRE Patterns</link></member> <member><function>implode</function></member> <member><function>preg_match</function></member> <member><function>preg_match_all</function></member> Modified: phpdoc/en/trunk/reference/pcre/pattern.modifiers.xml =================================================================== --- phpdoc/en/trunk/reference/pcre/pattern.modifiers.xml 2011-01-25 18:43:31 UTC (rev 307738) +++ phpdoc/en/trunk/reference/pcre/pattern.modifiers.xml 2011-01-25 19:10:19 UTC (rev 307739) @@ -87,10 +87,19 @@ Single quotes, double quotes, backslashes (<literal>\</literal>) and NULL chars will be escaped by backslashes in substituted backreferences. </simpara> - <para> - Only <function>preg_replace</function> uses this modifier; - it is ignored by other PCRE functions. - </para> + <tip> + <para> + Make sure that <parameter>replacement</parameter> constitutes a valid PHP code string, + otherwise PHP will complain about a parse error at the line containing + <function>preg_replace</function>. + </para> + </tip> + <note> + <para> + Only <function>preg_replace</function> uses this modifier; + it is ignored by other PCRE functions. + </para> + </note> </listitem> </varlistentry> <varlistentry>

« previous php.doc.cvs (#7671) next »