Merge branch 'master' into master

Author: mevdschee

api.php

@@ -89,14 +89,13 @@ public function __construct() {
 					k1."TABLE_NAME" COLLATE \'utf8_bin\' = k2."TABLE_NAME" COLLATE \'utf8_bin\' AND
 					k1."REFERENCED_TABLE_NAME" COLLATE \'utf8_bin\' = ? AND
 					k2."REFERENCED_TABLE_NAME" COLLATE \'utf8_bin\' IN ?',
-			'reflect_type'=> 'SELECT
-					"COLUMN_NAME", "COLUMN_TYPE"
-				FROM
-					"INFORMATION_SCHEMA"."COLUMNS"
-				WHERE
-					"TABLE_SCHEMA" = ? AND
-					"TABLE_NAME" = ?
-			'
+			'reflect_type'=> 'SELECT 
+					"COLUMN_NAME", "COLUMN_TYPE" 
+				FROM 
+					"INFORMATION_SCHEMA"."COLUMNS" 
+				WHERE 
+					"TABLE_SCHEMA" = ? AND 
+					"TABLE_NAME" = ?'
 		);
 	}
 
@@ -2228,7 +2227,7 @@ protected function swagger($settings) {
 				$result = $this->db->query($this->db->getSql('reflect_type'),array($database,$table_list[0]));
 				while ($row = $this->db->fetchRow($result)) {
 					$expl = explode('(',$row[1]);
-					$table_fields[$table['name']][$row[0]]->type = $expl[0];
+					$table_fields[$table['name']][$row[0]]->type = $expl[0];					
 				}
 			}