vrana Sat Sep 17 06:25:09 2005 EDT
Modified files:
/phpdoc/en/reference/session reference.xml
/phpdoc/en/reference/session/functions session-id.xml
Log:
SID inconsistency (spotted by David Vance)
http://cvs.php.net/diff.php/phpdoc/en/reference/session/reference.xml?r1=1.51&r2=1.52&ty=u
Index: phpdoc/en/reference/session/reference.xml
diff -u phpdoc/en/reference/session/reference.xml:1.51
phpdoc/en/reference/session/reference.xml:1.52
--- phpdoc/en/reference/session/reference.xml:1.51 Sun Sep 4 15:39:28 2005
+++ phpdoc/en/reference/session/reference.xml Sat Sep 17 06:25:03 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.51 $ -->
+<!-- $Revision: 1.52 $ -->
<!-- Purpose: basic.session -->
<!-- Membership: core -->
@@ -352,7 +352,7 @@
</para>
<para>
Alternatively, you can use the constant <literal>SID</literal> which is
- always defined. If the client did not send an appropriate session
+ defined if the session started. If the client did not send an
appropriate session
cookie, it has the form <literal>session_name=session_id</literal>.
Otherwise, it expands to an empty string. Thus, you can embed it
unconditionally into URLs.
http://cvs.php.net/diff.php/phpdoc/en/reference/session/functions/session-id.xml?r1=1.10&r2=1.11&ty=u
Index: phpdoc/en/reference/session/functions/session-id.xml
diff -u phpdoc/en/reference/session/functions/session-id.xml:1.10
phpdoc/en/reference/session/functions/session-id.xml:1.11
--- phpdoc/en/reference/session/functions/session-id.xml:1.10 Fri Jul 8
14:12:55 2005
+++ phpdoc/en/reference/session/functions/session-id.xml Sat Sep 17
06:25:08 2005
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
<!-- splitted from ./en/functions/session.xml, last change in rev 1.2 -->
<refentry id="function.session-id">
<refnamediv>
@@ -19,9 +19,8 @@
<para>
The constant <systemitem>SID</systemitem> can also be used to
retrieve the current name and session id as a string suitable for
- adding to URLs. Note that <systemitem>SID</systemitem> is only defined if
- the client didn't send the right cookie. See also <link
- linkend="ref.session">Session handling</link>.
+ adding to URLs. See also <link linkend="ref.session">Session
+ handling</link>.
</para>
</refsect1>
