Lib: Fixed one field return, fixed encoding

- Executing a DoQuery with a single field results in the field array not
  being an array of fields and their values, but an array of that single
  field. If this is detected, it imposes another array as if there were
  more than one field.
- Removed htmlspecialchars() from arr2Xml. This may cause issues
  downstream, but we will see...

Author: tflanagan

quickbase.php

@@ -105,7 +105,7 @@ class QuickBaseQuery {
 
 	protected $payload = '';
 	protected $xmlResponse = array();
-	
+
 	public function __construct(&$parent, $action = '', $options = array()){
 		$this->parent = $parent;
 		$this->action = $action;
@@ -281,14 +281,14 @@ final protected static function arr2Xml($arr, &$xml){
 			foreach($arr as $key => $value){
 				if($key === '$'){
 					foreach($value as $attr => $attrValue){
-						$xml->addAttribute($attr, htmlspecialchars($attrValue));
+						$xml->addAttribute($attr, $attrValue);
 					}
 
 					continue;
 				}
 
 				if($key === '_'){
-					$xml[0] = htmlspecialchars($value);
+					$xml[0] = $value;
 
 					continue;
 				}
@@ -312,7 +312,7 @@ final protected static function arr2Xml($arr, &$xml){
 				self::arr2Xml($arr[$key], $child);
 			}
 		}else{
-			$xml[0] = htmlspecialchars($arr);
+			$xml[0] = $arr;
 		}
 	}
 
@@ -531,6 +531,10 @@ final public static function API_DoQuery(&$query, &$results){
 						$newRecord['rid'] = $results['table']['records'][$i]['rid'];
 					}
 
+					if(isset($results['table']['records'][$i]['f']['_'])){
+						$results['table']['records'][$i]['f'] = array( $results['table']['records'][$i]['f'] );
+					}
+
 					foreach($results['table']['records'][$i]['f'] as $key => $field){
 						$newRecord[$field['id']] = $field['_'];
 					}