WebSVN – lars-tiefland.ci – Diff – /system/database/drivers/mysqli/mysqli_result.php

+ *
  * An open source application development framework for PHP
+ *
  * This content is released under the MIT License (MIT)
+ *
- * Copyright (c) 2014 - 2018, British Columbia Institute of Technology
+ * Copyright (c) 2014 - 2017, British Columbia Institute of Technology
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
  * in the Software without restriction, including without limitation the rights
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * THE SOFTWARE.
+ *
  * @package	CodeIgniter
  * @author	EllisLab Dev Team
  * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (https://ellislab.com/)
- * @copyright	Copyright (c) 2014 - 2018, British Columbia Institute of Technology (http://bcit.ca/)
+ * @copyright	Copyright (c) 2014 - 2017, British Columbia Institute of Technology (http://bcit.ca/)
  * @license	http://opensource.org/licenses/MIT	MIT License
  * @link	https://codeigniter.com
  * @since	Version 1.3.0
  * @filesource
  */
+	 *
 	 * Extracts field type info from the bitflags returned by
 	 * mysqli_result::fetch_fields()
+	 *
 	 * @used-by	CI_DB_mysqli_result::field_data()
-	 * @param	int	$type
+	 * @param	int	$flags
 	 * @return	string
 	 */
-	private static function _get_field_type($type)
+	private static function _get_field_type($flags)
+	{
 		static $map;
 		isset($map) OR $map = array(
 			MYSQLI_TYPE_DECIMAL     => 'decimal',
 			MYSQLI_TYPE_BIT         => 'bit',
 			MYSQLI_TYPE_STRING      => 'char',
 			MYSQLI_TYPE_VAR_STRING  => 'varchar',
 			MYSQLI_TYPE_GEOMETRY    => 'geometry'
 		);
+		foreach ($map as $flag => $name)
+		{
+			if ($flags & $flag)
+			{
+				return $name;
+			}
+		}
-		return isset($map[$type]) ? $map[$type] : $type;
+		return $flags;
+	}

Subversion-Projekte lars-tiefland.ci

(root)/system/database/drivers/mysqli/mysqli_result.php – Revision 2242 → 2254