Merge branch '4.0-dev' of https://github.com/joomla/joomla-cms into j…

…4search_remove # Conflicts: # plugins/search/categories/categories.xml # plugins/search/contacts/contacts.xml # plugins/search/content/content.xml # plugins/search/newsfeeds/newsfeeds.xml # plugins/search/tags/tags.xml
joomla · Jul 4, 2018 · 8bbe750 · 8bbe750
2 parents 4332f4d + a65d619
commit 8bbe750
Show file tree

Hide file tree

Showing 115 changed files with 879 additions and 738 deletions.
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-04-14.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-04-14.sql
@@ -5,10 +5,8 @@ CREATE TABLE `#__finder_links_terms` (
 	PRIMARY KEY (`link_id`, `term_id`),
 	INDEX `idx_term_weight` (`term_id`, `weight`),
 	INDEX `idx_link_term_weight` (`link_id`, `term_id`, `weight`)
-)
-COLLATE='utf8mb4_general_ci'
-ENGINE=InnoDB
-;
+) COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
+
 DROP TABLE #__finder_links_terms0;
 DROP TABLE #__finder_links_terms1;
 DROP TABLE #__finder_links_terms2;
@@ -26,20 +24,14 @@ DROP TABLE #__finder_links_termsd;
 DROP TABLE #__finder_links_termse;
 DROP TABLE #__finder_links_termsf;
 
-ALTER TABLE `#__finder_terms`
-	CHANGE COLUMN `language` `language` CHAR(7) NOT NULL DEFAULT '' AFTER `links`;
+ALTER TABLE `#__finder_terms` CHANGE `language` `language` CHAR(7) NOT NULL DEFAULT '' AFTER `links`;
 
-ALTER TABLE `#__finder_terms_common`
-	CHANGE COLUMN `language` `language` CHAR(7) NOT NULL DEFAULT '' AFTER `term`;
+ALTER TABLE `#__finder_terms_common` CHANGE `language` `language` CHAR(7) NOT NULL DEFAULT '' AFTER `term`;
 
-ALTER TABLE `#__finder_tokens`
-	CHANGE COLUMN `language` `language` CHAR(7) NOT NULL DEFAULT '' AFTER `context`;
+ALTER TABLE `#__finder_tokens` CHANGE `language` `language` CHAR(7) NOT NULL DEFAULT '' AFTER `context`;
 
-ALTER TABLE `#__finder_tokens_aggregate`
-	DROP COLUMN `map_suffix`;
+ALTER TABLE `#__finder_tokens_aggregate` DROP COLUMN `map_suffix`;
 
-ALTER TABLE `#__finder_tokens_aggregate`
-	CHANGE COLUMN `language` `language` CHAR(7) NOT NULL DEFAULT '' AFTER `total_weight`;
+ALTER TABLE `#__finder_tokens_aggregate` CHANGE `language` `language` CHAR(7) NOT NULL DEFAULT '' AFTER `total_weight`;
 
-ALTER TABLE `#__finder_links`
-	CHANGE COLUMN `language` `language` CHAR(7) NOT NULL DEFAULT '' AFTER `access`;
+ALTER TABLE `#__finder_links` CHANGE `language` `language` CHAR(7) NOT NULL DEFAULT '' AFTER `access`;
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-02.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2018-07-02.sql
@@ -0,0 +1 @@
+UPDATE `#__extensions` SET `protected` = 1 WHERE `name` = 'plg_extension_namespacemap';
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-02.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2018-07-02.sql
@@ -0,0 +1 @@
+UPDATE "#__extensions" SET "protected" = 1 WHERE "name" = 'plg_extension_namespacemap';
diff --git a/administrator/components/com_config/forms/application.xml b/administrator/components/com_config/forms/application.xml
@@ -35,7 +35,7 @@
 			filter="integer"
 			validate="number"
 			showon="caching:1,2"
-			size="6" />
+		 />
 
 		<field
 			name="cache_path"
@@ -92,7 +92,6 @@
 			default="11211"
 			filter="integer"
 			validate="number"
-			size="5"
 		/>
 
 		<field
@@ -128,7 +127,6 @@
 			default="6379"
 			filter="integer"
 			validate="number"
-			size="5"
 		/>
 
 		<field
@@ -148,7 +146,6 @@
 			default="0"
 			filter="integer"
 			showon="cache_handler:redis"
-			size="4"
 		/>
 
 		<field
@@ -159,7 +156,6 @@
 			default="15"
 			filter="integer"
 			validate="number"
-			size="6"
 		/>
 
 		<field
@@ -300,7 +296,6 @@
 			hint="21"
 			validate="number"
 			filter="integer"
-			size="5"
 		/>
 
 		<field
@@ -369,7 +364,6 @@
 			hint="8080"
 			validate="number"
 			filter="integer"
-			size="5"
 		/>
 
 		<field
@@ -520,7 +514,6 @@
 			hint="25"
 			validate="number"
 			filter="integer"
-			size="5"
 		/>
 
 		<field
@@ -803,7 +796,6 @@
 			default="11211"
 			validate="number"
 			filter="integer"
-			size="5"
 		/>
 
 		<field
@@ -842,7 +834,6 @@
 			default="6379"
 			validate="number"
 			filter="integer"
-			size="5"
 		/>
 
 		<field
@@ -864,7 +855,6 @@
 			default="0"
 			filter="integer"
 			showon="session_handler:redis"
-			size="4"
 		/>
 		<field
 			name="lifetime"
@@ -875,7 +865,6 @@
 			default="15"
 			filter="integer"
 			validate="number"
-			size="6"
 		/>
 
 		<field

diff --git a/administrator/components/com_finder/config.xml b/administrator/components/com_finder/config.xml
@@ -32,7 +32,6 @@
 			name="description_length"
 			type="number"
 			label="COM_FINDER_CONFIG_DESCRIPTION_LENGTH_LABEL"
-			size="5"
 			default="255"
 			filter="integer"
 			showon="show_description:1"
@@ -224,7 +223,6 @@
 			name="memory_table_limit"
 			type="number"
 			label="COM_FINDER_CONFIG_MEMORY_TABLE_LIMIT_LABEL"
-			size="10"
 			default="30000"
 			filter="integer"
 		/>
@@ -233,39 +231,34 @@
 			name="title_multiplier"
 			type="number"
 			label="COM_FINDER_CONFIG_TITLE_MULTIPLIER_LABEL"
-			size="5"
 			default="1.7"
 		/>
 
 		<field
 			name="text_multiplier"
 			type="number"
 			label="COM_FINDER_CONFIG_TEXT_MULTIPLIER_LABEL"
-			size="5"
 			default="0.7"
 		/>
 
 		<field
 			name="meta_multiplier"
 			type="number"
 			label="COM_FINDER_CONFIG_META_MULTIPLIER_LABEL"
-			size="5"
 			default="1.2"
 		/>
 
 		<field
 			name="path_multiplier"
 			type="number"
 			label="COM_FINDER_CONFIG_PATH_MULTIPLIER_LABEL"
-			size="5"
 			default="2.0"
 		/>
 
 		<field
 			name="misc_multiplier"
 			type="number"
 			label="COM_FINDER_CONFIG_MISC_MULTIPLIER_LABEL"
-			size="5"
 			default="0.3"
 		/>
 

diff --git a/administrator/components/com_media/config.xml b/administrator/components/com_media/config.xml
@@ -19,7 +19,6 @@
 			description="COM_MEDIA_FIELD_MAXIMUM_SIZE_DESC" 
 			validate="number"
 			min="0"
-			size="50"
 			default="10"
 		/>
 

diff --git a/administrator/components/com_messages/forms/config.xml b/administrator/components/com_messages/forms/config.xml
@@ -27,7 +27,6 @@
 			name="auto_purge"
 			type="number"
 			label="COM_MESSAGES_FIELD_AUTO_PURGE_LABEL"
-			size="6"
 			default="7"
 		/>
 	</fieldset>

diff --git a/administrator/components/com_modules/forms/moduleadmin.xml b/administrator/components/com_modules/forms/moduleadmin.xml
@@ -52,7 +52,7 @@
 			name="published" 
 			type="list"
 			label="JSTATUS"
-			class="chzn-color-state"
+			class="custom-select-color-state"
 			default="1"
 			size="1"
 			>

diff --git a/administrator/components/com_newsfeeds/config.xml b/administrator/components/com_newsfeeds/config.xml
@@ -79,7 +79,6 @@
 			description="COM_NEWSFEEDS_FIELD_CHARACTER_COUNT_DESC"
 			id="feed_character_count"
 			default="0"
-			size="6"
 		/>
 
 		<field 

diff --git a/administrator/components/com_newsfeeds/forms/newsfeed.xml b/administrator/components/com_newsfeeds/forms/newsfeed.xml
@@ -100,15 +100,13 @@
 			type="number"
 			label="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_LABEL"
 			default="5"
-			size="2"
 		/>
 
 		<field
 			name="cache_time"
 			type="number"
 			label="COM_NEWSFEEDS_FIELD_CACHETIME_LABEL"
 			default="3600"
-			size="4"
 		/>
 
 		<field
@@ -322,15 +320,13 @@
 			type="number"
 			label="COM_NEWSFEEDS_FIELD_NUM_ARTICLES_LABEL"
 			default="5"
-			size="2"
 		/>
 
 		<field
 			name="cache_time"
 			type="number"
 			label="COM_NEWSFEEDS_FIELD_CACHETIME_LABEL"
 			default="3600"
-			size="4"
 		/>
 
 		<field
@@ -381,7 +377,6 @@
 				type="number"
 				label="COM_NEWSFEEDS_FIELD_CHARACTERS_COUNT_LABEL"
 				description="COM_NEWSFEEDS_FIELD_CHARACTERS_COUNT_DESC"
-				size="6"
 				useglobal="true"
 			/>
 
@@ -436,7 +431,6 @@
 				type="number"
 				label="JGLOBAL_HITS"
 				class="readonly"
-				size="6"
 				readonly="true"
 				filter="unset"
 			/>

diff --git a/administrator/components/com_redirect/forms/link.xml b/administrator/components/com_redirect/forms/link.xml
@@ -87,7 +87,6 @@
 			label="JGLOBAL_HITS"
 			id="hits"
 			class="readonly"
-			size="20"
 			readonly="true"
 			filter="unset" 
 		/>

diff --git a/administrator/components/com_users/forms/user.xml b/administrator/components/com_users/forms/user.xml
@@ -134,7 +134,7 @@
 			name="id"
 			type="number"
 			label="JGLOBAL_FIELD_ID_LABEL"
-				class="readonly"
+			class="readonly"
 			default="0"
 			readonly="true"
 		/>

diff --git a/administrator/language/en-GB/en-GB.plg_extension_namespacemap.ini b/administrator/language/en-GB/en-GB.plg_extension_namespacemap.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EXTENSION_NAMESPACEMAP="Extension - Namespace Updater"
+PLG_EXTENSION_NAMESPACEMAP_XML_DESCRIPTION="Automatically builds and updates the <strong>libraries\autoload_psr4.php</strong> file that is used to autoload extensions.<br><strong>Warning! This plugin must be enabled</strong> it runs on extension install, update and deletion."
diff --git a/administrator/language/en-GB/en-GB.plg_extension_namespacemap.sys.ini b/administrator/language/en-GB/en-GB.plg_extension_namespacemap.sys.ini
@@ -0,0 +1,7 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2018 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+PLG_EXTENSION_NAMESPACEMAP="Extension - Namespace Updater"
+PLG_EXTENSION_NAMESPACEMAP_XML_DESCRIPTION="Automatically builds and updates the <strong>libraries\autoload_psr4.php</strong> file that is used to autoload extensions.<br><strong>Warning! This plugin must be enabled</strong> it runs on extension install, update and deletion."
diff --git a/administrator/language/en-GB/en-GB.plg_sampledata_multilang.ini b/administrator/language/en-GB/en-GB.plg_sampledata_multilang.ini
@@ -25,7 +25,8 @@ PLG_SAMPLEDATA_MULTILANG_STEP3_SUCCESS="Step 3: All Content Languages have been
 PLG_SAMPLEDATA_MULTILANG_STEP4_SUCCESS="Step 4: Specific Main Menus have been created as well as associated 'List All Categories' menu items!"
 PLG_SAMPLEDATA_MULTILANG_STEP5_SUCCESS="Step 5: Specific Main Menus modules have been created!"
 PLG_SAMPLEDATA_MULTILANG_STEP6_SUCCESS="Step 6: Categories, articles and 'Category Blog' menu items have been created and associated!"
-PLG_SAMPLEDATA_MULTILANG_STEP7_SUCCESS="Step 7: The Main Menu Module containing the Home menu item set to ALL languages has been unpublished!<br>Please reload this page."
+PLG_SAMPLEDATA_MULTILANG_STEP7_SUCCESS="Step 7: The Main Menu Module containing the Home menu item set to ALL languages has been unpublished!"
+PLG_SAMPLEDATA_MULTILANG_STEP8_SUCCESS="Multilingual Sample Data has been installed!"
 PLG_SAMPLEDATA_MULTILANG_STEP_FAILED="Step %1$u Failed: %2$s"
 PLG_SAMPLEDATA_MULTILANG_STEP_SKIPPED="Step %1$u Skipped: '%2$s' is either not installed or disabled."
 PLG_SAMPLEDATA_MULTILANG_XML_DESCRIPTION="Provides the multilingual sample data. Can be installed using the sample data module."
diff --git a/administrator/modules/mod_feed/tmpl/default.php b/administrator/modules/mod_feed/tmpl/default.php
@@ -68,7 +68,6 @@
 		// Feed description
 		if (!is_null($feed->title) && $params->get('rsstitle', 1)) : ?>
 			<h2 class="<?php echo $direction; ?>">
-			<h2>
 				<a href="<?php echo str_replace('&', '&amp;', $rssurl); ?>" target="_blank">
 				<?php echo $feed->title; ?></a>
 			</h2>

diff --git a/administrator/modules/mod_quickicon/mod_quickicon.xml b/administrator/modules/mod_quickicon/mod_quickicon.xml
@@ -59,7 +59,6 @@
 					name="cache_time"
 					type="number"
 					label="COM_MODULES_FIELD_CACHE_TIME_LABEL"
-
 					default="900"
 				/>
 			</fieldset>