Updates that add the table name in the where clause of the "get_other…

…s" and "get_languages" methods of base_module_model

fuel/modules/fuel/models/base_module_model.php

@@ -690,7 +690,8 @@ public function get_others($display_field, $id = NULL, $val_field = NULL)
 
 				if (in_array($CI->language_col, $fields))
 				{
-					$display_field = 'CONCAT('.$display_field.', " - ", '.$CI->language_col.') AS val_field';
+					if (strpos($display_field, '.') === FALSE) $display_field = $this->table_name.'.'.$display_field;
+					$display_field = 'CONCAT('.$display_field.', " - ", '.$this->table_name.'.'.$CI->language_col.') AS val_field';
 					$orderby = 'val_field ASC';
 				}
 			}
@@ -731,7 +732,7 @@ public function get_languages($field = NULL)
 		{
 			$this->db->distinct($field);
 		}
-
+		if (strpos($field, '.') === FALSE) $field = $this->table_name.'.'.$field;
 		$where[$field.' !='] = '';
 		$options = $this->options_list($field, $field, $where, TRUE, FALSE);
 		return $options;

fuel/modules/fuel/models/fuel_tags_model.php

@@ -169,17 +169,17 @@ public function options_list($key = 'id', $val = 'name', $where = array(), $orde
 	{
 		$this->db->join($this->_tables['fuel_categories'], $this->_tables['fuel_categories'].'.id = '.$this->_tables['fuel_tags'].'.category_id', 'LEFT');
 
-		if (empty($key)) $key = 'id';
-		if (empty($val)) $val = 'name';
+		if (empty($key)) $key = $this->_tables['fuel_categories'].'.id';
+		if (empty($val)) $val = $this->_tables['fuel_categories'].'.name';
 
 		// needed to prevent ambiguity
-		if (strpos($key, '.') === FALSE)
+		if (strpos($key, '.') === FALSE AND strpos($key, '(') === FALSE)
 		{
 			$key = $this->_tables['fuel_tags'].'.'.$key;
 		}
 
 		// needed to prevent ambiguity
-		if (strpos($val, '.') === FALSE)
+		if (strpos($val, '.') === FALSE AND strpos($val, '(') === FALSE)
 		{
 			$val = $this->_tables['fuel_tags'].'.'.$val;
 		}