From 93fbad0d6a9d1f792dd611b852b1ebfc1bf0e7ef Mon Sep 17 00:00:00 2001
From: Jakub Vrana <vrana@php.net>
Date: Sun, 25 Mar 2007 10:52:00 +0000
Subject: [PATCH] fetch functions return string (bug #40206)

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@232567 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/mysql/functions/mysql-fetch-array.xml    | 4 ++--
 reference/mysql/functions/mysql-fetch-assoc.xml    | 4 ++--
 reference/mysql/functions/mysql-fetch-object.xml   | 4 ++--
 reference/mysql/functions/mysql-fetch-row.xml      | 4 ++--
 reference/mysqli/functions/mysqli-fetch-array.xml  | 4 ++--
 reference/mysqli/functions/mysqli-fetch-assoc.xml  | 4 ++--
 reference/mysqli/functions/mysqli-fetch-object.xml | 5 +++--
 reference/mysqli/functions/mysqli-fetch-row.xml    | 4 ++--
 8 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/reference/mysql/functions/mysql-fetch-array.xml b/reference/mysql/functions/mysql-fetch-array.xml
index 3638dce674..f4c5938d07 100644
--- a/reference/mysql/functions/mysql-fetch-array.xml
+++ b/reference/mysql/functions/mysql-fetch-array.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.24 $ -->
+<!-- $Revision: 1.25 $ -->
 <refentry id="function.mysql-fetch-array">
  <refnamediv>
   <refname>mysql_fetch_array</refname>
@@ -42,7 +42,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an array that corresponds to the fetched row, or &false;
+   Returns an array of strings that corresponds to the fetched row, or &false;
    if there are no more rows. The type of returned array depends on
    how <parameter>result_type</parameter> is defined. By using 
    <constant>MYSQL_BOTH</constant> (default), you'll get an array with both 
diff --git a/reference/mysql/functions/mysql-fetch-assoc.xml b/reference/mysql/functions/mysql-fetch-assoc.xml
index 724ef1179f..ddcaa01fba 100644
--- a/reference/mysql/functions/mysql-fetch-assoc.xml
+++ b/reference/mysql/functions/mysql-fetch-assoc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
 <refentry id="function.mysql-fetch-assoc">
  <refnamediv>
   <refname>mysql_fetch_assoc</refname>
@@ -33,7 +33,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an associative array that corresponds to the fetched row, or 
+   Returns an associative array of strings that corresponds to the fetched row, or 
    &false; if there are no more rows.
   </para>
   <para>
diff --git a/reference/mysql/functions/mysql-fetch-object.xml b/reference/mysql/functions/mysql-fetch-object.xml
index 5cc4cb85aa..6433f54b92 100644
--- a/reference/mysql/functions/mysql-fetch-object.xml
+++ b/reference/mysql/functions/mysql-fetch-object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
 <refentry id="function.mysql-fetch-object">
  <refnamediv>
   <refname>mysql_fetch_object</refname>
@@ -50,7 +50,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an <type>object</type> with properties that correspond to the 
+   Returns an <type>object</type> with string properties that correspond to the
    fetched row, or &false; if there are no more rows.
   </para>
   <para>
diff --git a/reference/mysql/functions/mysql-fetch-row.xml b/reference/mysql/functions/mysql-fetch-row.xml
index 25dcce3c55..880994ed7e 100644
--- a/reference/mysql/functions/mysql-fetch-row.xml
+++ b/reference/mysql/functions/mysql-fetch-row.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <refentry id="function.mysql-fetch-row">
  <refnamediv>
   <refname>mysql_fetch_row</refname>
@@ -30,7 +30,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an numerical array that corresponds to the fetched row, or 
+   Returns an numerical array of strings that corresponds to the fetched row, or 
    &false; if there are no more rows.
   </para>
   <para>
diff --git a/reference/mysqli/functions/mysqli-fetch-array.xml b/reference/mysqli/functions/mysqli-fetch-array.xml
index 0c010889ce..118543638b 100644
--- a/reference/mysqli/functions/mysqli-fetch-array.xml
+++ b/reference/mysqli/functions/mysqli-fetch-array.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
 <refentry id="function.mysqli-fetch-array">
  <refnamediv>
   <refname>mysqli_fetch_array</refname>
@@ -77,7 +77,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an array that corresponds to the fetched row or &null; if there
+   Returns an array of strnigs that corresponds to the fetched row or &null; if there
    are no more rows in resultset.
   </para>
  </refsect1>
diff --git a/reference/mysqli/functions/mysqli-fetch-assoc.xml b/reference/mysqli/functions/mysqli-fetch-assoc.xml
index c85b943e7a..9c08837cb3 100644
--- a/reference/mysqli/functions/mysqli-fetch-assoc.xml
+++ b/reference/mysqli/functions/mysqli-fetch-assoc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.20 $ -->
+<!-- $Revision: 1.21 $ -->
 <refentry id="function.mysqli-fetch-assoc">
  <refnamediv>
   <refname>mysqli_fetch_assoc</refname>
@@ -42,7 +42,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an associative array representing the fetched row in the result
+   Returns an associative array of strnigs representing the fetched row in the result
    set, where each key in the array represents the name of one of the result
    set's columns or &null; if there are no more rows in resultset.
   </para>
diff --git a/reference/mysqli/functions/mysqli-fetch-object.xml b/reference/mysqli/functions/mysqli-fetch-object.xml
index 3bc1d7efda..b774149203 100644
--- a/reference/mysqli/functions/mysqli-fetch-object.xml
+++ b/reference/mysqli/functions/mysqli-fetch-object.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.19 $ -->
+<!-- $Revision: 1.20 $ -->
 <refentry id="function.mysqli-fetch-object">
  <refnamediv>
   <refname>mysqli_fetch_object</refname>
@@ -58,7 +58,8 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   Returns an object that corresponds to the fetched row or &null; if there are no more rows in resultset.
+   Returns an object with string properties that corresponds to the fetched
+   row or &null; if there are no more rows in resultset.
   </para>
   &database.field-case;
   &database.fetch-null;
diff --git a/reference/mysqli/functions/mysqli-fetch-row.xml b/reference/mysqli/functions/mysqli-fetch-row.xml
index 42c3b507eb..0df011be6c 100644
--- a/reference/mysqli/functions/mysqli-fetch-row.xml
+++ b/reference/mysqli/functions/mysqli-fetch-row.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.18 $ -->
+<!-- $Revision: 1.19 $ -->
 <refentry id="function.mysqli-fetch-row">
  <refnamediv>
   <refname>mysqli_fetch_row</refname>
@@ -42,7 +42,7 @@
  <refsect1 role="returnvalues">
   &reftitle.returnvalues;
   <para>
-   <function>mysqli_fetch_row</function> returns an array that corresponds to the fetched row
+   <function>mysqli_fetch_row</function> returns an array of strnigs that corresponds to the fetched row
    or &null; if there are no more rows in result set.
   </para>
   &database.fetch-null;