Merge branch 'staging' into 3.7.x

README.md

@@ -15,25 +15,26 @@ What is this?
 
 What is Joomla?
 ---------------------
-* Joomla is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
-* It is a simple and powerful web server application which requires a server with PHP and either MySQL, PostgreSQL or SQL Server to run. You can find more [details here](https://www.joomla.org/about-joomla.html).
+* [Joomla](https://www.joomla.org/about-joomla.html) is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
+* It is a simple and powerful web server application which requires a server with PHP and either MySQL, PostgreSQL or SQL Server to run. You can find [full technical requirements here](https://www.joomla.org/about-joomla/technical-requirements.html).
 * Joomla is **free and OpenSource software** distributed under the GNU General Public License version 2 or later.
 
 Is Joomla! for you?
 ---------------------
-* Joomla is [the right solution for most content web projects](https://docs.joomla.org/Joomla_Is_it_for_me%3F).
-* View Joomla's core [features here](https://www.joomla.org/core-features.html).
+* Joomla is [the right solution for most content web projects](https://docs.joomla.org/Portal:Learn_More).
+* View Joomla's [core features here](https://www.joomla.org/core-features.html).
 * Try it out for yourself in our [online demo](https://demo.joomla.org).
 
 How to find a Joomla! translation?
 ---------------------
-* Repository of [accredited language packs](http://community.joomla.org/translations.html).
-* You can also add languages directly to your website via your Joomla! administration panel.
+* Repository of [accredited language packs](https://community.joomla.org/translations.html).
+* You can also [add languages](https://docs.joomla.org/J3.x:Setup_a_Multilingual_Site/Installing_New_Language) directly to your website via your Joomla! administration panel.
+* Learn how to [setup a Multilingual Joomla! Site](https://docs.joomla.org/J3.x:Setup_a_Multilingual_Site)
 
 Learn Joomla!
 ---------------------
 * Read ['Getting Started with Joomla!'](https://docs.joomla.org/J3.x:Getting_Started_with_Joomla!) to learn the basics.
-* Before installing, read the ['Beginners' Guide'](https://docs.joomla.org/Beginners).
+* Before installing, read the ['Beginners' Guide'](https://docs.joomla.org/Portal:Beginners).
 
 What are the benefits of Joomla?
 ---------------------
@@ -45,12 +46,12 @@ Is it easy to change the layout display?
 ---------------------
 * The layout is controlled by templates that you can edit.
 * There are a lot of ready-made professional templates that you can download.
-* Template management information is [available here](https://docs.joomla.org/Portal:Administrators#Template_Management).
+* Template management information is [available here](https://docs.joomla.org/Portal:Template_Management).
 
 Ready to install Joomla?
 ---------------------
 * Check the [minimum requirements](https://www.joomla.org/about-joomla/technical-requirements.html). 
-* How do you [install Joomla](https://docs.joomla.org/Installing_Joomla!)?
+* How do you [install Joomla](https://docs.joomla.org/J3.x:Installing_Joomla)?
 * You could start your Joomla! experience by [building your site on a local test server](https://docs.joomla.org/Installing_Joomla_locally).
 When ready, it can be moved to an on-line hosting account of your choice.
 
@@ -67,20 +68,19 @@ Where can you get support and help?
 * Post questions at [our forums](http://forum.joomla.org);
 * [Joomla Resources Directory](http://resources.joomla.org/) (JRD).
 
-Do you already have a Joomla site that isn't built with Joomla 3.x?
+Do you already have a Joomla! site that isn't built with Joomla! 3.x?
 ---------------------
 * What's [new in Joomla! 3.x](https://www.joomla.org/3)?
 * What are the [main differences between 2.5 and 3.x](https://docs.joomla.org/What_are_the_major_differences_between_Joomla!_2.5_and_3.x%3F)?
 * How to [migrate from 2.5.x to 3.x](https://docs.joomla.org/Joomla_2.5_to_3.x_Step_by_Step_Migration).
 * How to [migrate from 1.5.x to 3.x](https://docs.joomla.org/Joomla_1.5_to_3.x_Step_by_Step_Migration).
-* How to [convert an existing website to Joomla](https://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site).
 
 Do you want to improve Joomla?
 --------------------
-* How do you [request a feature](https://docs.joomla.org/How_do_you_request_a_feature%3F)?
-* How do you [report a bug](https://docs.joomla.org/Filing_bugs_and_issues)?
+* Where to [request a feature](https://issues.joomla.org/)?
+* How do you [report a bug](https://docs.joomla.org/Filing_bugs_and_issues) on the [Issue Tracker](https://issues.joomla.org/)?
 * Get Involved: Joomla! is community developed software. [Join the community](https://volunteers.joomla.org/).
-* Documentation for [Developers](https://docs.joomla.org/Developers).
+* Documentation for [Developers](https://docs.joomla.org/Portal:Developers).
 * Documentation for [Web designers](https://docs.joomla.org/Web_designers).
 
 Copyright

README.txt

@@ -6,38 +6,40 @@
 
 2- What is Joomla?
 	* Joomla is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
-	* It's a free and OpenSource software, distributed under the GNU General Public License version 2 or later
-	* This is a simple and powerful web server application and it requires a server with PHP and either MySQL, PostgreSQL, or SQL Server to run it.
-	More details here: https://www.joomla.org/about-joomla.html
+	* It's a free and OpenSource software, distributed under the GNU General Public License version 2 or later.
+	* This is a simple and powerful web server application and it requires a server with PHP and either MySQL, PostgreSQL, or SQL Server to run.
+	You can find full technical requirements here: https://www.joomla.org/about-joomla/technical-requirements.html.
 
-3- Is Joomla for you?
-	* Joomla is the right solution for any content web project: https://docs.joomla.org/Joomla_Is_it_for_me%3F
-	* See Features - https://www.joomla.org/core-features.html
+3- Is Joomla! for you?
+	* Joomla is the right solution for most content web projects: https://docs.joomla.org/Portal:Learn_More
+	* See Joomla's core features - https://www.joomla.org/core-features.html
 	* Try out our online demo: https://demo.joomla.org/
 
 4- How to find a Joomla! translation?
 	* Repository of accredited language packs: http://community.joomla.org/translations.html
-	* You can also add languages directly to your website via your Joomla! administration panel.
+	* You can also add languages directly to your website via your Joomla! administration panel: https://docs.joomla.org/J3.x:Setup_a_Multilingual_Site/Installing_New_Language
+	* Learn how to setup a Multilingual Joomla! Site: https://docs.joomla.org/J3.x:Setup_a_Multilingual_Site
 
 5- Learn Joomla!
 	* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/J3.x:Getting_Started_with_Joomla!
-	* Before installing, read the beginners guide: https://docs.joomla.org/Beginners
+	* Before installing, read the beginners guide: https://docs.joomla.org/Portal:Beginners
 
-6- What are the limits of Joomla?
-	* Joomla sites can be extended in functionalities with Extensions that you can create (or download) to suite your needs.
-	* There are lots of ready made extensions that you can download and install.
-	* See the Joomla! Extensions Directory (JED): http://extensions.joomla.org
+6- What are the benefits of Joomla?
+	* The functionality of a Joomla website can be extended by installing extensions that you can create (or download) to suit your needs.
+	* There are many ready-made extensions that you can download and install.
+	* Check out the Joomla! Extensions Directory (JED): http://extensions.joomla.org
 
 7- Is it easy to change the layout display?
 	* The layout is controlled by templates that you can edit.
-	* There are lots of ready made templates that you can download.
+	* There are a lot of ready-made professional templates that you can download.
+	* Check out the template management information: https://docs.joomla.org/Portal:Template_Management
 
 8- Ready to install Joomla?
-	* See minimum requirements here: https://www.joomla.org/about-joomla/technical-requirements.html
-	* How do you install Joomla! ? - https://docs.joomla.org/Installing_Joomla!
-	* Start your Joomla experience building your site with a local test server.
+	* Check the minimum requirements here: https://www.joomla.org/about-joomla/technical-requirements.html
+	* How do you install Joomla - hhttps://docs.joomla.org/J3.x:Installing_Joomla
+	* You could start your Joomla! experience building your site on a local test server.
 	When ready it can be moved to an on-line hosting account of your choice.
-	See the tutorial: https://docs.joomla.org/Tutorial:Joomla_Local_install
+	See the tutorial: https://docs.joomla.org/Installing_Joomla_locally
 
 9- Updates are free!
 	* Always use the latest version: https://www.joomla.org/download.html
@@ -48,21 +50,20 @@
 	* Find the information you need: https://docs.joomla.org/Start_here
 	* Find help and other users: https://www.joomla.org/about-joomla/create-and-share.html
 	* Post questions at our forums: http://forum.joomla.org
-	* Joomla Resources Directory (JRD): http://resources.joomla.org/
+	* Joomla! Resources Directory (JRD): http://resources.joomla.org/
 
-11- Do you already have a Joomla site that's not built with Joomla 3.x ?
-	* What's new in Joomla 3.x: https://www.joomla.org/3
-	* What are the main differences from 2.5 to 3? Table of contents: https://docs.joomla.org/Differences_from_Joomla_2.5_to_Joomla_3.0
+11- Do you already have a Joomla! site that's not built with Joomla! 3.x ?
+	* What's new in Joomla! 3.x: https://www.joomla.org/3
+	* What are the main differences from 2.5 to 3? https://docs.joomla.org/What_are_the_major_differences_between_Joomla!_2.5_and_3.x%3F
 	* How to migrate from 2.5.x to 3.x? Tutorial: https://docs.joomla.org/Joomla_2.5_to_3.x_Step_by_Step_Migration
 	* How to migrate from 1.5.x to 3.x? Tutorial: https://docs.joomla.org/Joomla_1.5_to_3.x_Step_by_Step_Migration
-	* Convert an existing Web site to Joomla: https://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site
 
 12- Do you want to improve Joomla?
-	* How do you request a feature? https://docs.joomla.org/How_do_you_request_a_feature%3F
+	* Where to request a feature? https://issues.joomla.org/
 	* How do you report a bug? https://docs.joomla.org/Filing_bugs_and_issues
 	* Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org/
-	* Are you a Developer? https://docs.joomla.org/Developers
-	* Are you a Web designer? https://docs.joomla.org/Web_designers
+	* Documentation for Developers: https://docs.joomla.org/Portal:Developers
+	* Documentation for Web designers: https://docs.joomla.org/Web_designers
 
 Copyright:
 	* Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.

administrator/components/com_admin/script.php

@@ -31,6 +31,8 @@ public function update($installer)
 		JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
 		JLog::add(JText::_('COM_JOOMLAUPDATE_UPDATE_LOG_DELETE_FILES'), JLog::INFO, 'Update');
 
+		// This needs to stay for 2.5 update compatibility
+		$this->deleteUnexistingFiles();
 		$this->updateManifestCaches();
 		$this->updateDatabase();
 		$this->clearRadCache();

administrator/components/com_banners/models/forms/banner.xml

@@ -169,6 +169,7 @@
 			name="modified_by"
 			type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			description="COM_BANNERS_FIELD_MODIFIED_BY_DESC"
 			class="readonly"
 			readonly="true"
 			filter="unset"

administrator/components/com_categories/helpers/categories.php

@@ -148,7 +148,7 @@ public static function createCategory($data)
 		JModelLegacy::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/models');
 		JTable::addIncludePath(JPATH_ADMINISTRATOR . '/components/com_categories/tables');
 
-		$categoryModel = JModelLegacy::getInstance('Category', 'CategoriesModel');
+		$categoryModel = JModelLegacy::getInstance('Category', 'CategoriesModel', array('ignore_request' => true));
 		$categoryModel->save($data);
 
 		$catid = $categoryModel->getState('category.id');

administrator/components/com_categories/views/category/tmpl/edit.php

@@ -45,8 +45,8 @@
 
 // In case of modal
 $isModal = $input->get('layout') == 'modal' ? true : false;
-$layout = $isModal ? 'modal' : 'edit';
-$tmpl = $isModal ? '&tmpl=component' : '';
+$layout  = $isModal ? 'modal' : 'edit';
+$tmpl    = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_categories&extension=' . $input->getCmd('extension', 'com_content') . '&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="item-form" class="form-validate">

administrator/components/com_categories/views/category/tmpl/edit_associations.php

@@ -9,4 +9,11 @@
 
 defined('_JEXEC') or die;
 
-echo JLayoutHelper::render('joomla.edit.associations', $this);
+if ($this->item->id != 0 && $this->item->language != '*')
+{
+	echo JLayoutHelper::render('joomla.edit.associations', $this);
+}
+else
+{
+	echo '<div class="alert alert-info">' . JText::_('JGLOBAL_ASSOC_NOT_POSSIBLE') . '</div>';
+}

administrator/components/com_config/model/application.php

@@ -127,7 +127,16 @@ public function save($data)
 				$host    = JUri::getInstance()->getHost();
 				$options = new \Joomla\Registry\Registry;
 				$options->set('userAgent', 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:41.0) Gecko/20100101 Firefox/41.0');
-				$options->set('transport.curl', array(CURLOPT_SSL_VERIFYPEER => false));
+
+				// Do not check for valid server certificate here, leave this to the user, moreover disable using a proxy if any is configured.
+				$options->set('transport.curl',
+					array(
+						CURLOPT_SSL_VERIFYPEER => false,
+						CURLOPT_SSL_VERIFYHOST => false,
+						CURLOPT_PROXY => null,
+						CURLOPT_PROXYUSERPWD => null,
+					)
+				);
 				$response = JHttpFactory::getHttp($options)->get('https://' . $host . JUri::root(true) . '/', array('Host' => $host), 10);
 
 				// If available in HTTPS check also the status code.

administrator/components/com_contact/config.xml

@@ -23,12 +23,13 @@
 			label="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_LABEL"
 			description="COM_CONTACT_FIELD_CONTACT_SHOW_CATEGORY_DESC"
 			default="hide"
+			class="chzn-color"
 			>
 			<option value="hide">JHIDE</option>
 			<option value="show_no_link">COM_CONTACT_FIELD_VALUE_NO_LINK</option>
 			<option value="show_with_link">COM_CONTACT_FIELD_VALUE_WITH_LINK</option>
 		</field>
-		
+
 		<field
 			name="save_history"
 			type="radio"
@@ -40,7 +41,7 @@
 			<option value="1">JYES</option>
 			<option value="0">JNO</option>
 		</field>
-		
+
 		<field
 			name="history_limit"
 			type="text"
@@ -342,11 +343,11 @@
 		/>
 
 		<field
-			name="linkc_name" 
+			name="linkc_name"
 			type="text"
-			label="COM_CONTACT_FIELD_LINKC_NAME_LABEL" 
+			label="COM_CONTACT_FIELD_LINKC_NAME_LABEL"
 			description="COM_CONTACT_FIELD_LINK_NAME_DESC"
-			size="30" 
+			size="30"
 			showon="show_links:1"
 		/>
 
@@ -405,7 +406,7 @@
 			type="media"
 			label="COM_CONTACT_FIELD_ICONS_ADDRESS_LABEL"
 			description="COM_CONTACT_FIELD_ICONS_ADDRESS_DESC"
-			hide_none="1" 
+			hide_none="1"
 			showon="contact_icons:0"
 		/>
 
@@ -414,24 +415,24 @@
 			type="media"
 			label="COM_CONTACT_FIELD_ICONS_EMAIL_LABEL"
 			description="COM_CONTACT_FIELD_ICONS_EMAIL_DESC"
-			hide_none="1" 
+			hide_none="1"
 			showon="contact_icons:0"
 		/>
 
 		<field
 			name="icon_telephone"
 			type="media"
 			label="COM_CONTACT_FIELD_ICONS_TELEPHONE_LABEL"
-			description="COM_CONTACT_FIELD_ICONS_TELEPHONE_DESC" 
+			description="COM_CONTACT_FIELD_ICONS_TELEPHONE_DESC"
 			hide_none="1"
 			showon="contact_icons:0"
 		/>
 
 		<field
 			name="icon_mobile"
 			type="media"
-			label="COM_CONTACT_FIELD_ICONS_MOBILE_LABEL" 
-			description="COM_CONTACT_FIELD_ICONS_MOBILE_DESC" 
+			label="COM_CONTACT_FIELD_ICONS_MOBILE_LABEL"
+			description="COM_CONTACT_FIELD_ICONS_MOBILE_DESC"
 			hide_none="1"
 			showon="contact_icons:0"
 		/>
@@ -440,16 +441,16 @@
 			name="icon_fax"
 			type="media"
 			label="COM_CONTACT_FIELD_ICONS_FAX_LABEL"
-			description="COM_CONTACT_FIELD_ICONS_FAX_DESC" 
-			hide_none="1" 
+			description="COM_CONTACT_FIELD_ICONS_FAX_DESC"
+			hide_none="1"
 			showon="contact_icons:0"
 		/>
 
 		<field
 			name="icon_misc"
 			type="media"
 			label="COM_CONTACT_FIELD_ICONS_MISC_LABEL"
-			description="COM_CONTACT_FIELD_ICONS_MISC_DESC" 
+			description="COM_CONTACT_FIELD_ICONS_MISC_DESC"
 			hide_none="1"
 			showon="contact_icons:0"
 		/>
@@ -620,7 +621,7 @@
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
-		
+
 		<field
 			name="show_empty_categories_cat"
 			type="radio"
@@ -662,7 +663,7 @@
 			class="btn-group btn-group-yesno"
 			>
 			<option value="1">JSHOW</option>
-			<option value="0">JHIDE</option>		
+			<option value="0">JHIDE</option>
 		</field>
 
 		<field
@@ -692,7 +693,7 @@
 		<field
 			name="show_image_heading"
 			type="radio"
-			label="COM_CONTACT_FIELD_CONFIG_SHOW_IMAGE_LABEL" 
+			label="COM_CONTACT_FIELD_CONFIG_SHOW_IMAGE_LABEL"
 			description="COM_CONTACT_FIELD_CONFIG_SHOW_IMAGE_DESC"
 			default="1"
 			class="btn-group btn-group-yesno"
@@ -947,7 +948,7 @@
 			name="redirect"
 			type="text"
 			label="COM_CONTACT_FIELD_CONFIG_REDIRECT_LABEL"
-			description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC" 
+			description="COM_CONTACT_FIELD_CONFIG_REDIRECT_DESC"
 			size="30"
 			showon="show_email_form:1"
 		/>

administrator/components/com_contact/models/forms/contact.xml

@@ -138,6 +138,7 @@
 			name="modified_by"
 			type="user"
 			label="JGLOBAL_FIELD_MODIFIED_BY_LABEL"
+			description="COM_CONTACT_FIELD_MODIFIED_BY_DESC"
 			class="readonly"
 			readonly="true"
 			filter="unset"
@@ -431,6 +432,7 @@
 				type="list"
 				label="JGLOBAL_SHOW_CATEGORY_LABEL"
 				description="COM_CONTACT_FIELD_SHOW_CATEGORY_DESC"
+				class="chzn-color"
 				>
 				<option value="">JGLOBAL_USE_GLOBAL</option>
 				<option value="hide">JHIDE</option>

administrator/components/com_contact/views/contact/tmpl/edit.php

@@ -42,8 +42,8 @@
 
 // In case of modal
 $isModal = $input->get('layout') == 'modal' ? true : false;
-$layout = $isModal ? 'modal' : 'edit';
-$tmpl = $isModal ? '&tmpl=component' : '';
+$layout  = $isModal ? 'modal' : 'edit';
+$tmpl    = $isModal || $input->get('tmpl', '', 'cmd') === 'component' ? '&tmpl=component' : '';
 ?>
 
 <form action="<?php echo JRoute::_('index.php?option=com_contact&layout=' . $layout . $tmpl . '&id=' . (int) $this->item->id); ?>" method="post" name="adminForm" id="contact-form" class="form-validate">