Merge pull request #42 from brianteeman/language-flags

Language flags
joomla · Apr 1, 2016 · c7a7255 · c7a7255
2 parents 9c8d3cf + 59e9f9a
commit c7a7255
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/administrator/components/com_fields/models/fields.php b/administrator/components/com_fields/models/fields.php
@@ -122,7 +122,7 @@ protected function getListQuery ()
 		$query->from('#__fields AS a');
 
 		// Join over the language
-		$query->select('l.title AS language_title')->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language');
+		$query->select('l.title AS language_title, l.image AS language_image')->join('LEFT', $db->quoteName('#__languages') . ' AS l ON l.lang_code = a.language');
 
 		// Join over the users for the checked out user.
 		$query->select('uc.name AS editor')->join('LEFT', '#__users AS uc ON uc.id=a.checked_out');

diff --git a/administrator/components/com_fields/views/fields/tmpl/default.php b/administrator/components/com_fields/views/fields/tmpl/default.php
@@ -189,7 +189,7 @@
 								<?php if ($item->language == '*') : ?>
 									<?php echo JText::alt('JALL', 'language'); ?>
 								<?php else: ?>
-									<?php echo $item->language_title ? $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
+									<?php echo $item->language_title ? JHtml::_('image', 'mod_languages/' . $item->language_image . '.gif', $item->language_title, array('title' => $item->language_title), true) . '&nbsp;' . $this->escape($item->language_title) : JText::_('JUNDEFINED'); ?>
 								<?php endif; ?>
 							</td>
 							<td class="center hidden-phone">