Changeset 25427

Timestamp:

Nov 10, 2013, 6:03:25 PM (10 years ago)

Author:

mistic100

Message:

move array_from_query to functions.inc.php

Location:

trunk/include

Files:

• dblayer/functions_mysql.inc.php (modified) (1 diff)
• dblayer/functions_mysqli.inc.php (modified) (1 diff)
• functions.inc.php (modified) (1 diff)

trunk/include/dblayer/functions_mysql.inc.php

@@ -201 +201 @@
  */
 
-/**
- * creates an array based on a query, this function is a very common pattern
- * used here
- *
- * @param string $query
- * @param string $fieldname optional
- * @return array
- */
-function array_from_query($query, $fieldname=false)
-{
-  $array = array();
-
-  $result = pwg_query($query);
-  if (false === $fieldname)
-  {
-    while ($row = mysql_fetch_assoc($result))
-    {
-      $array[] = $row;      
-    }
-  }
-  else
-  {
-    while ($row = mysql_fetch_assoc($result))
-    {
-      $array[] = $row[$fieldname];
-    }
-  }
-  return $array;
-}
-
 define('MASS_UPDATES_SKIP_EMPTY', 1);
 /**

trunk/include/dblayer/functions_mysqli.inc.php

@@ -238 +238 @@
  */
 
-/**
- * creates an array based on a query, this function is a very common pattern
- * used here
- *
- * @param string $query
- * @param string $fieldname optional
- * @return array
- */
-function array_from_query($query, $fieldname=false)
-{
-  $array = array();
-
-  $result = pwg_query($query);
-  if (false === $fieldname)
-  {
-    while ($row = pwg_db_fetch_assoc($result))
-    {
-      $array[] = $row;      
-    }
-  }
-  else
-  {
-    while ($row = pwg_db_fetch_assoc($result))
-    {
-      $array[] = $row[$fieldname];
-    }
-  }
-  return $array;
-}
-
 define('MASS_UPDATES_SKIP_EMPTY', 1);
 /**

trunk/include/functions.inc.php

@@ -1315 +1315 @@
 
 /**
+ * creates a numeric array based on a SQL query.
+ * if _$fieldname_ is empty the returned value will be an array of arrays
+ * if _$fieldname_ is provided the returned value will be a one dimension array
+ *
+ * @param string $query
+ * @param string $fieldname
+ * @return array
+ */
+function array_from_query($query, $fieldname=false)
+{
+  $array = array();
+
+  $result = pwg_query($query);
+  if (false === $fieldname)
+  {
+    while ($row = pwg_db_fetch_assoc($result))
+    {
+      $array[] = $row;      
+    }
+  }
+  else
+  {
+    while ($row = pwg_db_fetch_assoc($result))
+    {
+      $array[] = $row[$fieldname];
+    }
+  }
+  return $array;
+}
+
+/**
  * Return the basename of the current script.
  * The lowercase case filename of the current script without extension