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

joomla · Aug 29, 2017 · 08cc1e3 · 08cc1e3
2 parents 2ca48a1 + ba5a07d
commit 08cc1e3
Show file tree

Hide file tree

Showing 3 changed files with 191 additions and 193 deletions.
diff --git a/administrator/components/com_content/models/article.php b/administrator/components/com_content/models/article.php
@@ -525,7 +525,7 @@ public function save($data)
 			$catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_content');
 		}
 
-		// Save New Categoryg
+		// Save New Category
 		if ($catid == 0 && $this->canCreateCategory())
 		{
 			$table = array();

diff --git a/administrator/components/com_content/models/forms/filter_featured.xml b/administrator/components/com_content/models/forms/filter_featured.xml
@@ -2,101 +2,100 @@
 <form>
 	<fields name="filter">
 		<field
-				name="search"
-				type="text"
-				label="COM_CONTENT_FILTER_SEARCH_LABEL"
-				description="COM_CONTENT_FILTER_SEARCH_DESC"
-				hint="JSEARCH_FILTER"
+			name="search"
+			type="text"
+			label="COM_CONTENT_FILTER_SEARCH_LABEL"
+			description="COM_CONTENT_FILTER_SEARCH_DESC"
+			hint="JSEARCH_FILTER"
 		/>
 
 		<field
-				name="published"
-				type="status"
-				label="COM_CONTENT_FILTER_PUBLISHED"
-				description="COM_CONTENT_FILTER_PUBLISHED_DESC"
-				onchange="this.form.submit();"
-				>
+			name="published"
+			type="status"
+			label="COM_CONTENT_FILTER_PUBLISHED"
+			description="COM_CONTENT_FILTER_PUBLISHED_DESC"
+			onchange="this.form.submit();"
+			>
 			<option value="">JOPTION_SELECT_PUBLISHED</option>
 		</field>
 
 		<field
-				name="category_id"
-				type="category"
-				label="JOPTION_FILTER_CATEGORY"
-				description="JOPTION_FILTER_CATEGORY_DESC"
-				multiple="true"
-				class="multipleCategories"
-				extension="com_content"
-				onchange="this.form.submit();"
+			name="category_id"
+			type="category"
+			label="JOPTION_FILTER_CATEGORY"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			multiple="true"
+			class="multipleCategories"
+			extension="com_content"
+			onchange="this.form.submit();"
 		/>
 
 		<field
-				name="level"
-				type="integer"
-				label="JOPTION_FILTER_LEVEL"
-				description="JOPTION_FILTER_LEVEL_DESC"
-				first="1"
-				last="10"
-				step="1"
-				languages="*"
-				onchange="this.form.submit();"
-				>
+			name="level"
+			type="integer"
+			label="JOPTION_FILTER_LEVEL"
+			description="JOPTION_FILTER_LEVEL_DESC"
+			first="1"
+			last="10"
+			step="1"
+			languages="*"
+			onchange="this.form.submit();"
+			>
 			<option value="">JOPTION_SELECT_MAX_LEVELS</option>
 		</field>
 
 		<field
-				name="author_id"
-				type="author"
-				label="COM_CONTENT_FILTER_AUTHOR"
-				description="COM_CONTENT_FILTER_AUTHOR_DESC"
-				multiple="true"
-				class="multipleAuthors"
-				onchange="this.form.submit();"
+			name="author_id"
+			type="author"
+			label="COM_CONTENT_FILTER_AUTHOR"
+			description="COM_CONTENT_FILTER_AUTHOR_DESC"
+			multiple="true"
+			class="multipleAuthors"
+			onchange="this.form.submit();"
 		/>
 
 		<field
-				name="access"
-				type="accesslevel"
-				label="JOPTION_FILTER_ACCESS"
-				description="JOPTION_FILTER_ACCESS_DESC"
-				multiple="true"
-				class="multipleAccessLevels"
-				onchange="this.form.submit();"
+			name="access"
+			type="accesslevel"
+			label="JOPTION_FILTER_ACCESS"
+			description="JOPTION_FILTER_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
 		/>
 
 		<field
-				name="language"
-				type="contentlanguage"
-				label="JOPTION_FILTER_LANGUAGE"
-				description="JOPTION_FILTER_LANGUAGE_DESC"
-				onchange="this.form.submit();"
-		>
+			name="language"
+			type="contentlanguage"
+			label="JOPTION_FILTER_LANGUAGE"
+			description="JOPTION_FILTER_LANGUAGE_DESC"
+			onchange="this.form.submit();"
+			>
 			<option value="">JOPTION_SELECT_LANGUAGE</option>
 			<option value="*">JALL</option>
 		</field>
 
 		<field
-				name="tag"
-				type="tag"
-				label="JOPTION_FILTER_TAG"
-				description="JOPTION_FILTER_TAG_DESC"
-				multiple="true"
-				class="multipleTags"
-				mode="nested"
-				onchange="this.form.submit();"
+			name="tag"
+			type="tag"
+			label="JOPTION_FILTER_TAG"
+			description="JOPTION_FILTER_TAG_DESC"
+			multiple="true"
+			class="multipleTags"
+			mode="nested"
+			onchange="this.form.submit();"
 		/>
-
 	</fields>
 
 	<fields name="list">
 		<field
-				name="fullordering"
-				type="list"
-				label="COM_CONTENT_LIST_FULL_ORDERING"
-				description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
-				onchange="this.form.submit();"
-				default="a.title ASC"
-				>
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.title ASC"
+			>
 			<option value="">JGLOBAL_SORT_BY</option>
 			<option value="fp.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
 			<option value="fp.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
@@ -129,13 +128,13 @@
 		</field>
 
 		<field
-				name="limit"
-				type="limitbox"
-				label="COM_CONTENT_LIST_LIMIT"
-				description="COM_CONTENT_LIST_LIMIT_DESC"
-				class="input-mini"
-				default="25"
-				onchange="this.form.submit();"
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
 		/>
 	</fields>
 </form>