Merge branch 'staging' of github.com:joomla/joomla-cms into com_finder

joomla · Aug 20, 2017 · 6f02092 · 6f02092
2 parents 16e3dfb + 691e472
commit 6f02092
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/administrator/components/com_fields/models/forms/field.xml b/administrator/components/com_fields/models/forms/field.xml
@@ -285,7 +285,7 @@
 				<option value="1">COM_FIELDS_FIELD_DISPLAY_AFTER_TITLE</option>
 				<option value="2">COM_FIELDS_FIELD_DISPLAY_BEFORE_DISPLAY</option>
 				<option value="3">COM_FIELDS_FIELD_DISPLAY_AFTER_DISPLAY</option>
-				<option value="0">JNO</option>
+				<option value="0">COM_FIELDS_FIELD_DISPLAY_NO_DISPLAY</option>
 			</field>
 		</fieldset>
 	</fields>

diff --git a/administrator/language/en-GB/en-GB.com_fields.ini b/administrator/language/en-GB/en-GB.com_fields.ini
@@ -19,6 +19,7 @@ COM_FIELDS_FIELD_DISPLAY_AFTER_TITLE="After Title"
 COM_FIELDS_FIELD_DISPLAY_BEFORE_DISPLAY="Before Display"
 COM_FIELDS_FIELD_DISPLAY_DESC="Joomla offers some content events which are triggered during the content creation process. This is the place to define how the custom fields should be integrated into content."
 COM_FIELDS_FIELD_DISPLAY_LABEL="Automatic Display"
+COM_FIELDS_FIELD_DISPLAY_NO_DISPLAY="Do not automatically display"
 COM_FIELDS_FIELD_GROUP_DESC="The group this field belongs to."
 COM_FIELDS_FIELD_GROUP_LABEL="Field Group"
 COM_FIELDS_FIELD_PLACEHOLDER_DESC="Placeholder text which will appear inside the field as a hint to the user for the required input."

diff --git a/components/com_content/controllers/article.php b/components/com_content/controllers/article.php
@@ -243,7 +243,7 @@ protected function getRedirectToItemAppend($recordId = null, $urlVar = 'a_id')
 
 		$itemId = $this->input->getInt('Itemid');
 		$return = $this->getReturnPage();
-		$catId  = $this->input->getInt('catid', null, 'get');
+		$catId  = $this->input->getInt('catid');
 
 		if ($itemId)
 		{

diff --git a/components/com_users/controllers/profile.php b/components/com_users/controllers/profile.php
@@ -33,7 +33,7 @@ public function edit()
 
 		// Get the previous user id (if any) and the current user id.
 		$previousId = (int) $app->getUserState('com_users.edit.profile.id');
-		$userId     = $this->input->getInt('user_id', null, 'array');
+		$userId     = $this->input->getInt('user_id');
 
 		// Check if the user is trying to edit another users profile.
 		if ($userId != $loginUserId)