john            Wed Nov 20 00:01:38 2002 EDT

  Modified files:              
    /phpdoc/en/reference/var/functions  serialize.xml unserialize.xml 
  Log:
  Cleaned some things up some more.
  
  
Index: phpdoc/en/reference/var/functions/serialize.xml
diff -u phpdoc/en/reference/var/functions/serialize.xml:1.3 
phpdoc/en/reference/var/functions/serialize.xml:1.4
--- phpdoc/en/reference/var/functions/serialize.xml:1.3 Tue Nov 19 21:45:02 2002
+++ phpdoc/en/reference/var/functions/serialize.xml     Wed Nov 20 00:01:37 2002
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
 <!-- splitted from ./en/functions/var.xml, last change in rev 1.28 -->
   <refentry id="function.serialize">
    <refnamediv>
@@ -33,10 +33,10 @@
    </simpara>
    <simpara>
    When serializing objects, PHP will attempt to call the member function 
-__sleep() prior to serialization. This is to allow the object to do any 
-last minute clean-up, etc. prior to being serialized. Likewise, when the 
-object is restored using <function>unserialize</function> the __wakeup() 
-member function is called.
+   __sleep() prior to serialization. This is to allow the object to do any 
+   last minute clean-up, etc. prior to being serialized. Likewise, when 
+   the object is restored using <function>unserialize</function> the __wakeup() 
+   member function is called.
    </simpara>
    <!-- TODO
         in 4.0.4pl1 this didn't work properly, however, there
Index: phpdoc/en/reference/var/functions/unserialize.xml
diff -u phpdoc/en/reference/var/functions/unserialize.xml:1.8 
phpdoc/en/reference/var/functions/unserialize.xml:1.9
--- phpdoc/en/reference/var/functions/unserialize.xml:1.8       Tue Nov 19 21:51:21 
2002
+++ phpdoc/en/reference/var/functions/unserialize.xml   Wed Nov 20 00:01:37 2002
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
 <!-- splitted from ./en/functions/var.xml, last change in rev 1.2 -->
   <refentry id="function.unserialize">
    <refnamediv>
@@ -13,7 +13,7 @@
      <methodsynopsis>
       <type>mixed</type><methodname>unserialize</methodname>
       <methodparam><type>string</type><parameter>str</parameter></methodparam>
-      <methodparam><type>string</type><parameter>callback</parameter></methodparam>
+      <methodparam 
+choice="opt"><type>string</type><parameter>callback</parameter></methodparam>
      </methodsynopsis>
     <simpara>
      <function>unserialize</function> takes a single serialized
@@ -26,18 +26,26 @@
     <note>
      <title>unserialize_callback_func directive</title>
      <para>
-      (PHP >= 4.2.0) It's possible to set a callback-function which will be called,
+      It's possible to set a callback-function which will be called,
       if an undefined class should be instantiated during unserializing.
       (to prevent getting an incomplete <type>object</type> "__PHP_Incomplete_Class".)
-      Use your &php.ini;, <function>ini_set</function> or .htaccess-file 
+      Use your &php.ini;, <function>ini_set</function> or 
+<filename>.htaccess</filename> 
       to define 'unserialize_callback_func'.  Everytime an undefined class
       should be instantiated, it'll be called.  To disable this feature just
       empty this setting.  Also note that the directive
-      unserialize_callback_func became available in PHP 4.2.0. 
+      unserialize_callback_func directive became 
+      available in PHP 4.2.0. 
+     </para>
+    </note>
+    <note>
+     <para>
+     The <parameter>callback</parameter> parameter was added in PHP 4.2.0
      </para>
     </note>
     <para>
-     If the variable being unserialized is an object, after successfully 
reconstructing the object PHP will automatically attempt to call the __wakeup() member 
function (if it exists). 
+     If the variable being unserialized is an object, after successfully 
+     reconstructing the object PHP will automatically attempt to call the
+     __wakeup() member function (if it exists). 
      <example>
       <title>unserialize_callback_func example</title>
       <programlisting role="php">



-- 
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to