iliaa Wed Jun 8 21:24:28 2005 EDT
Modified files:
/phpdoc/en language-snippets.ent
/phpdoc/en/reference/mysql ini.xml
Log:
INI settings for mysql_connect() are affected by SQL safe mode, not generic
safe mode.
http://cvs.php.net/diff.php/phpdoc/en/language-snippets.ent?r1=1.150&r2=1.151&ty=u
Index: phpdoc/en/language-snippets.ent
diff -u phpdoc/en/language-snippets.ent:1.150
phpdoc/en/language-snippets.ent:1.151
--- phpdoc/en/language-snippets.ent:1.150 Mon May 2 17:26:11 2005
+++ phpdoc/en/language-snippets.ent Wed Jun 8 21:24:28 2005
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.150 $ -->
+<!-- $Revision: 1.151 $ -->
<!-- Keep 'em sorted -->
@@ -382,6 +382,8 @@
<!-- These are here as helpers for manual consistency and brievety-->
<!ENTITY safemode '<link linkend="ini.safe-mode">safe mode</link>'>
+<!ENTITY sqlsafemode '<link linkend="ini.sql.safe-mode">SQL safe mode</link>'>
+
<!-- Notes for SAPI/Apache -->
<!ENTITY note.apache.nsapi-module '<note><para>As of PHP 4.3.3 you can use
this function with the
<link linkend="ref.nsapi">NSAPI server module</link> in Netscape/iPlanet/SunONE
http://cvs.php.net/diff.php/phpdoc/en/reference/mysql/ini.xml?r1=1.12&r2=1.13&ty=u
Index: phpdoc/en/reference/mysql/ini.xml
diff -u phpdoc/en/reference/mysql/ini.xml:1.12
phpdoc/en/reference/mysql/ini.xml:1.13
--- phpdoc/en/reference/mysql/ini.xml:1.12 Tue Feb 22 12:36:08 2005
+++ phpdoc/en/reference/mysql/ini.xml Wed Jun 8 21:24:28 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
<section id="mysql.configuration">
&reftitle.runtime;
&extension.runtime;
@@ -180,7 +180,7 @@
<para>
The default server host to use when connecting to the database
server if no other host is specified. Doesn't apply in
- &safemode;.
+ &sqlsafemode;.
</para>
</listitem>
</varlistentry>
@@ -194,7 +194,7 @@
<para>
The default user name to use when connecting to the database
server if no other name is specified. Doesn't apply in
- &safemode;.
+ &sqlsafemode;.
</para>
</listitem>
</varlistentry>
@@ -208,7 +208,7 @@
<para>
The default password to use when connecting to the database
server if no other password is specified. Doesn't apply in
- &safemode;.
+ &sqlsafemode;.
</para>
</listitem>
</varlistentry>
