From 4947b1b1c902b133bda5dd4004a05dc2ce686527 Mon Sep 17 00:00:00 2001
From: laoneo <allon.moritz@digital-peak.com>
Date: Tue, 21 Jun 2016 09:58:24 +0200
Subject: [PATCH] Add always the fields path when adding the custom fields

Closes #150
---
 administrator/components/com_fields/helpers/fields.php | 3 +++
 language/en-GB/en-GB.ini                               | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/administrator/components/com_fields/helpers/fields.php b/administrator/components/com_fields/helpers/fields.php
index 8bc6a6dd0acfa..d6b982709b6de 100644
--- a/administrator/components/com_fields/helpers/fields.php
+++ b/administrator/components/com_fields/helpers/fields.php
@@ -305,6 +305,9 @@ public static function prepareForm ($context, JForm $form, $data)
 			$fieldsPerCategory[$field->catid][] = $field;
 		}
 
+		// On the front, sometimes the admin fields path is not included
+		JFormHelper::addFieldPath(JPATH_ADMINISTRATOR . '/components/' . $component . '/models/fields');
+
 		// Looping trough the categories
 		foreach ($fieldsPerCategory as $catid => $catFields)
 		{
diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini
index a34aa665cc3bc..2a0f688691a32 100644
--- a/language/en-GB/en-GB.ini
+++ b/language/en-GB/en-GB.ini
@@ -55,6 +55,7 @@ JARCHIVED="Archived"
 JAUTHOR="Author"
 JCANCEL="Cancel"
 JCATEGORY="Category"
+JCLEAR="Clear"
 JDATE="Date"
 JDEFAULT="Default"
 JDETAILS="Details"
@@ -85,6 +86,7 @@ JPUBLISHED="Published"
 JREGISTER="Register"
 JREQUIRED="Required"
 JSAVE="Save"
+JSELECT="Select"
 JSHOW="Show"
 JSITE="Site"
 JSTATUS="Status"