Coping with possible missing stings in the Options

joomla · Oct 31, 2014 · e4782e9 · e4782e9
1 parent 63efbc2
commit e4782e9
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/libraries/cms/form/field/contenttype.php b/libraries/cms/form/field/contenttype.php
@@ -95,9 +95,18 @@ protected function getOptions()
 			$lang->load($comp . '.sys', JPATH_ADMINISTRATOR, null, false, true)
 			|| $lang->load($comp . '.sys', JPATH_ADMINISTRATOR . '/components/' . $comp, null, false, true);
 
-			$option->text = mb_strtoupper(str_replace(' ', '_', $option->text), 'UTF-8');
-			$option->text = $comp . '_CONTENT_TYPE_' . $option->text;
-			$option->text = JText::_($option->text);
+			$option->string = mb_strtoupper(str_replace(' ', '_', $option->text), 'UTF-8');
+			$option->string = $comp . '_CONTENT_TYPE_' . $option->string;
+
+			if ($lang->hasKey($option->string))
+			{
+				$option->text = JText::_($option->string);
+			}
+			else
+			{
+				$option->text = $option->text;
+			}
+
 		}
 
 		return $options;