joomla · wilsonge · Sep 1, 2019 · Jul 10, 2019 · Jul 11, 2019 · Jul 12, 2019
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+custom: https://community.joomla.org/sponsorship-campaigns.html
diff --git a/administrator/components/com_associations/View/Association/HtmlView.php b/administrator/components/com_associations/View/Association/HtmlView.php
@@ -118,8 +118,9 @@ public function display($tpl = null)
 		$referenceId   = $input->get('id', 0, 'int');
 		$reference     = ArrayHelper::fromObject(AssociationsHelper::getItem($extensionName, $typeName, $referenceId));
 
-		$this->referenceLanguage = $reference[$languageField];
-		$this->referenceTitle    = AssociationsHelper::getTypeFieldName($extensionName, $typeName, 'title');
+		$this->referenceLanguage   = $reference[$languageField];
+		$this->referenceTitle      = AssociationsHelper::getTypeFieldName($extensionName, $typeName, 'title');
+		$this->referenceTitleValue = $reference[$this->referenceTitle];
 
 		// Check for special case category
 		$typeNameExploded = explode('.', $typeName);

diff --git a/administrator/components/com_associations/tmpl/association/edit.php b/administrator/components/com_associations/tmpl/association/edit.php
@@ -44,6 +44,7 @@
 					data-item="<?php echo $this->typeName; ?>"
 					data-id="<?php echo $this->referenceId; ?>"
 					data-title="<?php echo $this->referenceTitle; ?>"
+					data-title-value="<?php echo $this->referenceTitleValue; ?>"
 					data-language="<?php echo $this->referenceLanguage; ?>"
 					data-editurl="<?php echo Route::_($this->editUri); ?>">
 				</iframe>

diff --git a/administrator/components/com_banners/Model/BannerModel.php b/administrator/components/com_banners/Model/BannerModel.php
@@ -373,6 +373,9 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
 		if ($this->canCreateCategory())
 		{
 			$form->setFieldAttribute('catid', 'allowAdd', 'true');
+
+			// Add a prefix for categories created on the fly.
+			$form->setFieldAttribute('catid', 'customPrefix', '#new#');
 		}
 
 		parent::preprocessForm($form, $data, $group);
@@ -391,20 +394,22 @@ public function save($data)
 	{
 		$input = Factory::getApplication()->input;
 
-		// Cast catid to integer for comparison
-		$catid = (int) $data['catid'];
+		// Create new category, if needed.
+		$createCategory = true;
 
-		// Check if New Category exists
-		if ($catid > 0)
+		// If category ID is provided, check if it's valid.
+		if (is_numeric($data['catid']) && $data['catid'])
 		{
-			$catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_banners');
+			$createCategory = !CategoriesHelper::validateCategoryId($data['catid'], 'com_banners');
 		}
 
 		// Save New Category
-		if ($catid == 0 && $this->canCreateCategory())
+		if ($createCategory && $this->canCreateCategory())
 		{
 			$table              = array();
-			$table['title']     = $data['catid'];
+
+			// Remove #new# prefix, if exists.
+			$table['title'] = strpos($data['catid'], '#new#') === 0 ? substr($data['catid'], 5) : $data['catid'];
 			$table['parent_id'] = 1;
 			$table['extension'] = 'com_banners';
 			$table['language']  = $data['language'];

diff --git a/administrator/components/com_categories/Field/CategoryeditField.php b/administrator/components/com_categories/Field/CategoryeditField.php
@@ -32,6 +32,14 @@ class CategoryeditField extends ListField
 	 */
 	protected $allowAdd;
 
+	/**
+	 * Optional prefix for new categories.
+	 *
+	 * @var    string
+	 * @since  3.9.11
+	 */
+	protected $customPrefix;
+
 	/**
 	 * A flexible category list that respects access controls
 	 *
@@ -69,6 +77,7 @@ public function setup(\SimpleXMLElement $element, $value, $group = null)
 		if ($return)
 		{
 			$this->allowAdd = isset($this->element['allowAdd']) ? (boolean) $this->element['allowAdd'] : false;
+			$this->customPrefix = (string) $this->element['customPrefix'];
 		}
 
 		return $return;
@@ -89,6 +98,8 @@ public function __get($name)
 		{
 			case 'allowAdd':
 				return (bool) $this->$name;
+			case 'customPrefix':
+				return $this->$name;
 		}
 
 		return parent::__get($name);
@@ -114,6 +125,9 @@ public function __set($name, $value)
 				$value = (string) $value;
 				$this->$name = ($value === 'true' || $value === $name || $value === '1');
 				break;
+			case 'customPrefix':
+				$this->$name = (string) $value;
+				break;
 			default:
 				parent::__set($name, $value);
 		}

diff --git a/administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php b/administrator/components/com_categories/layouts/joomla/form/field/categoryedit.php
@@ -71,6 +71,11 @@
 if ($allowCustom)
 {
 	$attr2 .= ' allow-custom';
+
+	if ($this->customPrefix !== '')
+	{
+		$attr2 .= ' data-custom_value_prefix="' . $this->customPrefix . '" ';
+	}
 }
 
 if ($required)

diff --git a/administrator/components/com_contact/Model/ContactModel.php b/administrator/components/com_contact/Model/ContactModel.php
@@ -278,20 +278,22 @@ public function save($data)
 	{
 		$input = Factory::getApplication()->input;
 
-		// Cast catid to integer for comparison
-		$catid = (int) $data['catid'];
+		// Create new category, if needed.
+		$createCategory = true;
 
-		// Check if New Category exists
-		if ($catid > 0)
+		// If category ID is provided, check if it's valid.
+		if (is_numeric($data['catid']) && $data['catid'])
 		{
-			$catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_contact');
+			$createCategory = !CategoriesHelper::validateCategoryId($data['catid'], 'com_contact');
 		}
 
 		// Save New Category
-		if ($catid == 0 && $this->canCreateCategory())
+		if ($createCategory && $this->canCreateCategory())
 		{
 			$table = array();
-			$table['title'] = $data['catid'];
+
+			// Remove #new# prefix, if exists.
+			$table['title'] = strpos($data['catid'], '#new#') === 0 ? substr($data['catid'], 5) : $data['catid'];
 			$table['parent_id'] = 1;
 			$table['extension'] = 'com_contact';
 			$table['language'] = $data['language'];
@@ -427,6 +429,9 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
 		if ($this->canCreateCategory())
 		{
 			$form->setFieldAttribute('catid', 'allowAdd', 'true');
+
+			// Add a prefix for categories created on the fly.
+			$form->setFieldAttribute('catid', 'customPrefix', '#new#');
 		}
 
 		// Association contact items

diff --git a/administrator/components/com_contact/tmpl/contacts/modal.php b/administrator/components/com_contact/tmpl/contacts/modal.php
@@ -44,7 +44,7 @@
 ?>
 <div class="container-popup">
 
-	<form action="<?php echo Route::_('index.php?option=com_contact&view=contacts&layout=modal&tmpl=component&function=' . $function . '&' . Session::getFormToken() . '=1'); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
+	<form action="<?php echo Route::_('index.php?option=com_contact&view=contacts&layout=modal&tmpl=component&editor=' . $editor . '&function=' . $function . '&' . Session::getFormToken() . '=1'); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
 
 		<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 

diff --git a/administrator/components/com_content/Model/ArticleModel.php b/administrator/components/com_content/Model/ArticleModel.php
@@ -780,20 +780,24 @@ public function save($data)
 			$data['images'] = (string) $registry;
 		}
 
-		// Cast catid to integer for comparison
-		$catid = (int) $data['catid'];
+		\JLoader::register('CategoriesHelper', JPATH_ADMINISTRATOR . '/components/com_categories/helpers/categories.php');
 
-		// Check if New Category exists
-		if ($catid > 0)
+		// Create new category, if needed.
+		$createCategory = true;
+
+		// If category ID is provided, check if it's valid.
+		if (is_numeric($data['catid']) && $data['catid'])
 		{
-			$catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_content');
+			$createCategory = !CategoriesHelper::validateCategoryId($data['catid'], 'com_content');
 		}
 
 		// Save New Category
-		if ($catid == 0 && $this->canCreateCategory())
+		if ($createCategory && $this->canCreateCategory())
 		{
 			$table = array();
-			$table['title'] = $data['catid'];
+
+			// Remove #new# prefix, if exists.
+			$table['title'] = strpos($data['catid'], '#new#') === 0 ? substr($data['catid'], 5) : $data['catid'];
 			$table['parent_id'] = 1;
 			$table['extension'] = 'com_content';
 			$table['language'] = $data['language'];
@@ -1115,6 +1119,9 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
 		if ($this->canCreateCategory())
 		{
 			$form->setFieldAttribute('catid', 'allowAdd', 'true');
+
+			// Add a prefix for categories created on the fly.
+			$form->setFieldAttribute('catid', 'customPrefix', '#new#');
 		}
 
 		// Association content items

diff --git a/administrator/components/com_fields/Model/FieldsModel.php b/administrator/components/com_fields/Model/FieldsModel.php
@@ -53,7 +53,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 				'checked_out_time', 'a.checked_out_time',
 				'created_time', 'a.created_time',
 				'created_user_id', 'a.created_user_id',
-				'category_title',
+				'group_title', 'g.title',
 				'category_id', 'a.category_id',
 				'group_id', 'a.group_id',
 				'assigned_cat_ids'

diff --git a/administrator/components/com_fields/View/Fields/HtmlView.php b/administrator/components/com_fields/View/Fields/HtmlView.php
@@ -219,7 +219,7 @@ protected function getSortFields()
 			'a.title'    => Text::_('JGLOBAL_TITLE'),
 			'a.type'     => Text::_('COM_FIELDS_FIELD_TYPE_LABEL'),
 			'a.access'   => Text::_('JGRID_HEADING_ACCESS'),
-			'language'   => Text::_('JGRID_HEADING_LANGUAGE'),
+			'a.language' => Text::_('JGRID_HEADING_LANGUAGE'),
 			'a.id'       => Text::_('JGRID_HEADING_ID'),
 		);
 	}

diff --git a/administrator/components/com_fields/tmpl/fields/modal.php b/administrator/components/com_fields/tmpl/fields/modal.php
@@ -29,7 +29,7 @@
 ?>
 <div class="container-popup">
 
-	<form action="<?php echo Route::_('index.php?option=com_fields&view=fields&layout=modal&tmpl=component&' . Session::getFormToken() . '=1'); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
+	<form action="<?php echo Route::_('index.php?option=com_fields&view=fields&layout=modal&tmpl=component&editor=' . $editor . '&' . Session::getFormToken() . '=1'); ?>" method="post" name="adminForm" id="adminForm" class="form-inline">
 
 		<?php echo LayoutHelper::render('joomla.searchtools.default', array('view' => $this)); ?>
 		<?php if (empty($this->items)) : ?>
@@ -51,7 +51,7 @@
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGLOBAL_TITLE', 'a.title', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" style="width:15%" class="d-none d-md-table-cell">
-							<?php echo HTMLHelper::_('searchtools.sort', 'COM_FIELDS_FIELD_GROUP_LABEL', 'group_title', $listDirn, $listOrder); ?>
+							<?php echo HTMLHelper::_('searchtools.sort', 'COM_FIELDS_FIELD_GROUP_LABEL', 'g.title', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" style="width:10%" class="d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'COM_FIELDS_FIELD_TYPE_LABEL', 'a.type', $listDirn, $listOrder); ?>
@@ -60,7 +60,7 @@
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ACCESS', 'a.access', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" style="width:10%" class="d-none d-md-table-cell">
-							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'language', $listDirn, $listOrder); ?>
+							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_LANGUAGE', 'a.language', $listDirn, $listOrder); ?>
 						</th>
 						<th scope="col" style="width:1%" class="d-none d-md-table-cell">
 							<?php echo HTMLHelper::_('searchtools.sort', 'JGRID_HEADING_ID', 'a.id', $listDirn, $listOrder); ?>

diff --git a/administrator/components/com_finder/Indexer/Parser/Html.php b/administrator/components/com_finder/Indexer/Parser/Html.php
@@ -65,9 +65,14 @@ public function parse($input)
 		// Convert entities equivalent to spaces to actual spaces.
 		$input = str_replace(array('&nbsp;', '&#160;'), ' ', $input);
 
-		// This fixes issues such as '<h1>Title</h1><p>Paragraph</p>'
-		// being transformed into 'TitleParagraph' with no space.
-		$input = str_replace('>', '> ', $input);
+		// Add a space before both the OPEN and CLOSE tags of BLOCK and LINE BREAKING elements,
+		// e.g. 'all<h1><em>m</em>obile  List</h1>' will become 'all mobile  List'
+		$input = preg_replace('/(<|<\/)(' .
+			'address|article|aside|blockquote|br|canvas|dd|div|dl|dt|' .
+			'fieldset|figcaption|figure|footer|form|h1|h2|h3|h4|h5|h6|header|hgroup|hr|li|' .
+			'main|nav|noscript|ol|output|p|pre|section|table|tfoot|ul|video' .
+			')\b/i', ' $1$2', $input
+		);
 
 		// Strip HTML tags.
 		$input = strip_tags($input);

diff --git a/administrator/components/com_languages/tmpl/multilangstatus/default.php b/administrator/components/com_languages/tmpl/multilangstatus/default.php
@@ -44,7 +44,7 @@
 				<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 				<?php echo Text::_('COM_LANGUAGES_MULTILANGSTATUS_HOMES_MISSING'); ?>
 			</div>
-		<?php endif; ?>	
+		<?php endif; ?>
 		<?php if ($notice_disabled) : ?>
 			<div class="alert alert-warning">
 				<span class="fa fa-exclamation-triangle" aria-hidden="true"></span>
@@ -83,9 +83,9 @@
 			<?php endif; ?>
 		<?php endforeach; ?>
 		<?php if ($this->listUsersError) : ?>
-			<div class="alert alert-info">
-				<span class="fa fa-help" aria-hidden="true"></span>
-				<span class="sr-only"><?php echo Text::_('JHELP'); ?></span>
+			<div class="alert alert-warning">
+				<span class="icon-pending" aria-hidden="true"></span>
+				<span class="sr-only"><?php echo Text::_('WARNING'); ?></span>
 				<?php echo Text::_('COM_LANGUAGES_MULTILANGSTATUS_CONTACTS_ERROR_TIP'); ?>
 				<ul>
 				<?php foreach ($this->listUsersError as $user) : ?>

diff --git a/administrator/components/com_newsfeeds/Model/NewsfeedModel.php b/administrator/components/com_newsfeeds/Model/NewsfeedModel.php
@@ -188,20 +188,22 @@ public function save($data)
 	{
 		$input = Factory::getApplication()->input;
 
-		// Cast catid to integer for comparison
-		$catid = (int) $data['catid'];
+		// Create new category, if needed.
+		$createCategory = true;
 
-		// Check if New Category exists
-		if ($catid > 0)
+		// If category ID is provided, check if it's valid.
+		if (is_numeric($data['catid']) && $data['catid'])
 		{
-			$catid = CategoriesHelper::validateCategoryId($data['catid'], 'com_newsfeeds');
+			$createCategory = !CategoriesHelper::validateCategoryId($data['catid'], 'com_newsfeeds');
 		}
 
 		// Save New Category
-		if ($catid == 0 && $this->canCreateCategory())
+		if ($createCategory && $this->canCreateCategory())
 		{
 			$table = array();
-			$table['title'] = $data['catid'];
+
+			// Remove #new# prefix, if exists.
+			$table['title'] = strpos($data['catid'], '#new#') === 0 ? substr($data['catid'], 5) : $data['catid'];
 			$table['parent_id'] = 1;
 			$table['extension'] = 'com_newsfeeds';
 			$table['language'] = $data['language'];
@@ -388,6 +390,9 @@ protected function preprocessForm(Form $form, $data, $group = 'content')
 		if ($this->canCreateCategory())
 		{
 			$form->setFieldAttribute('catid', 'allowAdd', 'true');
+
+			// Add a prefix for categories created on the fly.
+			$form->setFieldAttribute('catid', 'customPrefix', '#new#');
 		}
 
 		// Association newsfeeds items

diff --git a/administrator/components/com_postinstall/tmpl/messages/default.php b/administrator/components/com_postinstall/tmpl/messages/default.php
@@ -15,6 +15,7 @@
 use Joomla\CMS\Language\Text;
 use Joomla\CMS\Router\Route;
 
+$lang     = Factory::getLanguage();
 $renderer = Factory::getDocument()->loadRenderer('module');
 $options  = array('style' => 'raw');
 $mod      = ModuleHelper::getModule('mod_feed');
@@ -25,6 +26,7 @@
 	'rssimage'    => 1,
 	'rssitems'    => 5,
 	'rssitemdesc' => 1,
+	'rssrtl'      => $lang->isRtl() ? 1 : 0,
 	'word_count'  => 200,
 	'cache'       => 0,
 	);

diff --git a/administrator/components/com_templates/tmpl/style/edit_assignment.php b/administrator/components/com_templates/tmpl/style/edit_assignment.php
@@ -40,7 +40,7 @@
 
 					<?php foreach ($type->links as $link) : ?>
 						<label class="checkbox small" for="link<?php echo (int) $link->value; ?>" >
-						<input type="checkbox" name="jform[assigned][]" value="<?php echo (int) $link->value; ?>" id="link<?php echo (int) $link->value; ?>"<?php if ($link->template_style_id == $this->item->id) : ?> checked="checked"<?php endif; ?><?php if ($link->checked_out && $link->checked_out != $user->id) : ?> disabled="disabled"<?php else : ?> class="chk-menulink <?php echo $type->menutype; ?>"<?php endif; ?> />
+						<input type="checkbox" name="jform[assigned][]" value="<?php echo (int) $link->value; ?>" id="link<?php echo (int) $link->value; ?>"<?php if ($link->template_style_id == $this->item->id) : ?> checked="checked"<?php endif; ?><?php if ($link->checked_out && $link->checked_out != $user->id) : ?> disabled="disabled"<?php else : ?> class="chk-menulink menutype-<?php echo $type->menutype; ?>"<?php endif; ?> />
 						<?php echo LayoutHelper::render('joomla.html.treeprefix', array('level' => $link->level)) . $link->text; ?>
 						</label>
 					<?php endforeach; ?>

diff --git a/administrator/components/com_templates/tmpl/template/default_tree.php b/administrator/components/com_templates/tmpl/template/default_tree.php
@@ -11,7 +11,7 @@
 
 use Joomla\CMS\Router\Route;
 
-ksort($this->files, SORT_STRING);
+ksort($this->files, SORT_NATURAL);
 ?>
 
 <ul class="directory-tree treeselect">

diff --git a/administrator/language/en-GB/en-GB.com_content.ini b/administrator/language/en-GB/en-GB.com_content.ini
@@ -21,7 +21,7 @@ COM_CONTENT_BATCH_TIP="If a category is selected for move/copy, any actions sele
 COM_CONTENT_CHANGE_STAGE="Change stage"
 COM_CONTENT_CHANGE_STAGE_AMBIGUOUS_TRANSITIONS="Some transitions are ambiguous for this condition. Please select your preferred transition and proceed."
 COM_CONTENT_CONFIGURATION="Articles: Options"
-COM_CONTENT_CONFIG_ARTICLE_SETTINGS_DESC="These settings apply for article layouts unless they are changed for a specific menu item."
+COM_CONTENT_CONFIG_ARTICLE_SETTINGS_DESC="These settings apply for article layouts unless they are changed for a specific menu item or article."
 COM_CONTENT_CONFIG_BLOG_SETTINGS_DESC="These settings apply for blog or featured layouts unless they are changed for a specific menu item."
 COM_CONTENT_CONFIG_BLOG_SETTINGS_LABEL="Blog/Featured Layouts"
 COM_CONTENT_CONFIG_CATEGORIES_SETTINGS_DESC="These settings apply for Articles Categories Options, unless they are changed by the individual category or menu settings."

diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini
@@ -554,7 +554,7 @@ JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_DESC="If Show, the &quot;Subcategories&
 JGLOBAL_SHOW_CATEGORY_LABEL="Category"
 JGLOBAL_SHOW_CATEGORY_TITLE="Category Title"
 JGLOBAL_SHOW_CATEGORY_TITLE_DESC="If Show, the Category Title will show as a subheading on the page. The subheading is usually displayed inside the &quot;H2&quot; tag."
-JGLOBAL_SHOW_CREATE_DATE_DESC="If set to Show, the date and time an Article was created will be displayed. This is a global setting but can be changed at Menu and Article levels."
+JGLOBAL_SHOW_CREATE_DATE_DESC="If set to Show, the date and time an Article was created will be displayed."
 JGLOBAL_SHOW_CREATE_DATE_LABEL="Create Date"
 JGLOBAL_SHOW_DATE_DESC="Show or hide a date column in the list of articles, or select which date you wish to show."
 JGLOBAL_SHOW_DATE_LABEL="Date"
@@ -578,7 +578,7 @@ JGLOBAL_SHOW_NAVIGATION_DESC="If set to Show, shows a navigation link (Next, Pre
 JGLOBAL_SHOW_NAVIGATION_LABEL="Navigation"
 JGLOBAL_SHOW_PARENT_CATEGORY_DESC="If set to Show, the title of the article&rsquo;s parent category will show."
 JGLOBAL_SHOW_PARENT_CATEGORY_LABEL="Parent"
-JGLOBAL_SHOW_PUBLISH_DATE_DESC="If set to Show, the date and time an Article was published will be displayed. This is a global setting but can be changed at the Category, Menu and Article levels."
+JGLOBAL_SHOW_PUBLISH_DATE_DESC="If set to Show, the date and time an Article was published will be displayed."
 JGLOBAL_SHOW_PUBLISH_DATE_LABEL="Publish Date"
 JGLOBAL_SHOW_READMORE_DESC="If set to Show, the Read more ...Link will show if Main text has been provided for the Article."
 JGLOBAL_SHOW_READMORE_LABEL="&quot;Read More&quot; Link"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		custom: https://community.joomla.org/sponsorship-campaigns.html