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

joomla · Aug 17, 2017 · 9b67932 · 9b67932
2 parents a6e40cd + 4711ba1
commit 9b67932
Show file tree

Hide file tree

Showing 54 changed files with 118 additions and 70 deletions.
diff --git a/.github/SUPPORT.md b/.github/SUPPORT.md
@@ -0,0 +1,8 @@
+Where can you get support and help?
+====================
+* [The Joomla! Documentation](https://docs.joomla.org/Special:MyLanguage/Main_Page);
+* [Frequently Asked Questions](https://docs.joomla.org/Special:MyLanguage/Category:FAQ) (FAQ);
+* Find the [information you need](https://docs.joomla.org/Special:MyLanguage/Start_here);
+* Find [help and other users](https://www.joomla.org/about-joomla/create-and-share.html);
+* Post questions at [our forums](https://forum.joomla.org);
+* [Joomla Resources Directory](https://resources.joomla.org) (JRD).
diff --git a/README.md b/README.md
@@ -71,7 +71,7 @@ Where can you get support and help?
 * Find the [information you need](https://docs.joomla.org/Special:MyLanguage/Start_here);
 * Find [help and other users](https://www.joomla.org/about-joomla/create-and-share.html);
 * Post questions at [our forums](https://forum.joomla.org);
-* [Joomla Resources Directory](https://resources.joomla.org/) (JRD).
+* [Joomla Resources Directory](https://resources.joomla.org) (JRD).
 
 Do you already have a Joomla! site that isn't built with Joomla! 3.x?
 ---------------------
@@ -82,9 +82,9 @@ Do you already have a Joomla! site that isn't built with Joomla! 3.x?
 
 Do you want to improve Joomla?
 --------------------
-* Where to [request a feature](https://issues.joomla.org/)?
-* How do you [report a bug](https://docs.joomla.org/Special:MyLanguage/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/).
+* Where to [request a feature](https://issues.joomla.org)?
+* How do you [report a bug](https://docs.joomla.org/Special:MyLanguage/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/Special:MyLanguage/Portal:Developers).
 * Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers).
 

diff --git a/README.txt b/README.txt
@@ -13,7 +13,7 @@
 3- Is Joomla! for you?
 	* Joomla! is the right solution for most content web projects: https://docs.joomla.org/Special:MyLanguage/Portal:Learn_More
 	* See Joomla's core features - https://www.joomla.org/core-features.html
-	* Try out our online demo: https://demo.joomla.org/
+	* Try out our online demo: https://demo.joomla.org
 
 4- How to find a Joomla! translation?
 	* Repository of accredited language packs: https://community.joomla.org/translations.html
@@ -59,9 +59,9 @@
 	* How to migrate from 1.5.x to 3.x? Tutorial: https://docs.joomla.org/Special:MyLanguage/Joomla_1.5_to_3.x_Step_by_Step_Migration
 
 12- Do you want to improve Joomla?
-	* Where to request a feature? https://issues.joomla.org/
+	* Where to request a feature? https://issues.joomla.org
 	* How do you report a bug? https://docs.joomla.org/Special:MyLanguage/Filing_bugs_and_issues
-	* Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org/
+	* Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org
 	* Documentation for Developers: https://docs.joomla.org/Special:MyLanguage/Portal:Developers
 	* Documentation for Web designers: https://docs.joomla.org/Special:MyLanguage/Web_designers
 

diff --git a/administrator/components/com_admin/models/sysinfo.php b/administrator/components/com_admin/models/sysinfo.php
@@ -163,7 +163,7 @@ class AdminModelSysInfo extends JModelLegacy
 	 * Remove sections of data marked as private in the privateSettings
 	 *
 	 * @param   array   $dataArray  Array with data tha may contain private informati
-	 * @param   string  $dataType   Type of data to search for an specific section in the privateSettings array
+	 * @param   string  $dataType   Type of data to search for a specific section in the privateSettings array
 	 *
 	 * @return  array
 	 *

diff --git a/administrator/components/com_associations/views/association/view.html.php b/administrator/components/com_associations/views/association/view.html.php
@@ -154,7 +154,7 @@ public function display($tpl = null)
 			// We also need to change the category filter to show show categories with All or the forced language.
 			if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
 			{
-				// If the language is forced we can't allow to select the language, so transform the language selector filter into an hidden field.
+				// If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
 				$languageXml = new SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
 				$this->filterForm->setField($languageXml, 'filter', true);
 

diff --git a/administrator/components/com_categories/views/categories/view.html.php b/administrator/components/com_categories/views/categories/view.html.php
@@ -118,7 +118,7 @@ public function display($tpl = null)
 			// In article associations modal we need to remove language filter if forcing a language.
 			if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
 			{
-				// If the language is forced we can't allow to select the language, so transform the language selector filter into an hidden field.
+				// If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
 				$languageXml = new SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
 				$this->filterForm->setField($languageXml, 'filter', true);
 

diff --git a/administrator/components/com_contact/views/contacts/view.html.php b/administrator/components/com_contact/views/contacts/view.html.php
@@ -104,7 +104,7 @@ public function display($tpl = null)
 			// We also need to change the category filter to show show categories with All or the forced language.
 			if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
 			{
-				// If the language is forced we can't allow to select the language, so transform the language selector filter into an hidden field.
+				// If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
 				$languageXml = new SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
 				$this->filterForm->setField($languageXml, 'filter', true);
 

diff --git a/administrator/components/com_content/views/articles/view.html.php b/administrator/components/com_content/views/articles/view.html.php
@@ -120,7 +120,7 @@ public function display($tpl = null)
 			// We also need to change the category filter to show show categories with All or the forced language.
 			if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
 			{
-				// If the language is forced we can't allow to select the language, so transform the language selector filter into an hidden field.
+				// If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
 				$languageXml = new SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
 				$this->filterForm->setField($languageXml, 'filter', true);
 

diff --git a/administrator/components/com_finder/helpers/indexer/helper.php b/administrator/components/com_finder/helpers/indexer/helper.php
@@ -433,7 +433,7 @@ public static function getContentPath($url)
 	 * Method to get extra data for a content before being indexed. This is how
 	 * we add Comments, Tags, Labels, etc. that should be available to Finder.
 	 *
-	 * @param   FinderIndexerResult  &$item  The item to index as an FinderIndexerResult object.
+	 * @param   FinderIndexerResult  &$item  The item to index as a FinderIndexerResult object.
 	 *
 	 * @return  boolean  True on success, false on failure.
 	 *

diff --git a/administrator/components/com_languages/views/override/view.html.php b/administrator/components/com_languages/views/override/view.html.php
@@ -10,7 +10,7 @@
 defined('_JEXEC') or die;
 
 /**
- * View to edit an language override
+ * View to edit a language override
  *
  * @since  2.5
  */

diff --git a/administrator/components/com_menus/views/items/view.html.php b/administrator/components/com_menus/views/items/view.html.php
@@ -237,7 +237,7 @@ public function display($tpl = null)
 			// In menu associations modal we need to remove language filter if forcing a language.
 			if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
 			{
-				// If the language is forced we can't allow to select the language, so transform the language selector filter into an hidden field.
+				// If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
 				$languageXml = new SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
 				$this->filterForm->setField($languageXml, 'filter', true);
 

diff --git a/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php b/administrator/components/com_newsfeeds/views/newsfeeds/view.html.php
@@ -82,7 +82,7 @@ public function display($tpl = null)
 			// We also need to change the category filter to show show categories with All or the forced language.
 			if ($forcedLanguage = JFactory::getApplication()->input->get('forcedLanguage', '', 'CMD'))
 			{
-				// If the language is forced we can't allow to select the language, so transform the language selector filter into an hidden field.
+				// If the language is forced we can't allow to select the language, so transform the language selector filter into a hidden field.
 				$languageXml = new SimpleXMLElement('<field name="language" type="hidden" default="' . $forcedLanguage . '" />');
 				$this->filterForm->setField($languageXml, 'filter', true);
 

diff --git a/administrator/language/en-GB/en-GB.com_weblinks.ini b/administrator/language/en-GB/en-GB.com_weblinks.ini
@@ -81,7 +81,7 @@ COM_WEBLINKS_FIELD_WIDTH_LABEL="Width"
 COM_WEBLINKS_FIELDSET_IMAGES="Images"
 COM_WEBLINKS_FIELDSET_OPTIONS="Options"
 COM_WEBLINKS_FILTER_CATEGORY="Filter Category"
-COM_WEBLINKS_FILTER_SEARCH_DESC="Search in web link title and alias. Prefix with ID: to search for an web link ID."
+COM_WEBLINKS_FILTER_SEARCH_DESC="Search in web link title and alias. Prefix with ID: to search for a web link ID."
 COM_WEBLINKS_FILTER_SEARCH_LABEL="Search Web Links"
 COM_WEBLINKS_FILTER_STATE="Filter State"
 COM_WEBLINKS_FLOAT_DESC="Controls placement of the image."

diff --git a/administrator/modules/mod_logged/tmpl/default.php b/administrator/modules/mod_logged/tmpl/default.php
@@ -17,7 +17,7 @@
 			<div class="span8">
 				<?php if ($user->client_id == 0) : ?>
 					<a title="<?php echo JHtml::_('tooltipText', 'MOD_LOGGED_LOGOUT'); ?>" href="<?php echo $user->logoutLink; ?>" class="btn btn-danger btn-mini hasTooltip">
-						<span class="icon-remove icon-white" aria-hidden="true"><span class="element-invisible"><?php echo JText::_('JLOGOUT'); ?>"></span></span>
+						<span class="icon-remove icon-white" aria-hidden="true"><span class="element-invisible"><?php echo JText::_('JLOGOUT'); ?></span></span>
 					</a>
 				<?php endif; ?>
 

diff --git a/cli/deletefiles.php b/cli/deletefiles.php
@@ -6,6 +6,10 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/**
+ * A command line cron job to attempt to remove files that should have been deleted at update.
+ */
+
 // We are a valid entry point.
 const _JEXEC = 1;
 

diff --git a/cli/garbagecron.php b/cli/garbagecron.php
@@ -6,6 +6,10 @@
  * @license    GNU General Public License version 2 or later; see LICENSE.txt
  */
 
+/**
+ * A command line cron job to trash expired cache data.
+ */
+
 // Initialize Joomla framework
 const _JEXEC = 1;
 

diff --git a/components/com_content/router.php b/components/com_content/router.php
@@ -136,7 +136,7 @@ public function getArticleSegment($id, $query)
 	}
 
 	/**
-	 * Method to get the segment(s) for an form
+	 * Method to get the segment(s) for a form
 	 *
 	 * @param   string  $id     ID of the article form to retrieve the segments for
 	 * @param   array   $query  The request that is built right now

diff --git a/components/com_newsfeeds/helpers/legacyrouter.php b/components/com_newsfeeds/helpers/legacyrouter.php
@@ -85,7 +85,7 @@ public function build(&$query, &$segments)
 			unset($query['view']);
 		}
 
-		// Are we dealing with an newsfeed that is attached to a menu item?
+		// Are we dealing with a newsfeed that is attached to a menu item?
 		if (isset($query['view'], $query['id']) && $mView == $query['view'] && $mId == (int) $query['id'])
 		{
 			unset($query['view'], $query['catid'], $query['id']);

diff --git a/components/com_newsfeeds/views/newsfeed/view.html.php b/components/com_newsfeeds/views/newsfeed/view.html.php
@@ -95,7 +95,7 @@ public function display($tpl = null)
 		{
 			$currentLink = $active->link;
 
-			// If the current view is the active item and an newsfeed view for this feed, then the menu item params take priority
+			// If the current view is the active item and a newsfeed view for this feed, then the menu item params take priority
 			if (strpos($currentLink, 'view=newsfeed') && strpos($currentLink, '&id=' . (string) $item->id))
 			{
 				// $item->params are the newsfeed params, $temp are the menu item params

diff --git a/components/com_tags/views/tag/view.html.php b/components/com_tags/views/tag/view.html.php
@@ -150,7 +150,7 @@ public function display($tpl = null)
 		{
 			$currentLink = $active->link;
 
-			// If the current view is the active item and an tag view for one tag, then the menu item params take priority
+			// If the current view is the active item and a tag view for one tag, then the menu item params take priority
 			if (strpos($currentLink, 'view=tag') && strpos($currentLink, '&id[0]=' . (string) $item[0]->id))
 			{
 				// $item[0]->params are the tag params, $temp are the menu item params

diff --git a/installation/model/languages.php b/installation/model/languages.php
@@ -720,7 +720,7 @@ public function publishContentLanguages()
 	 *
 	 * This function checks other existing language with the same code, if they exist provides a unique SEF name.
 	 * For instance: en-GB, en-US and en-AU will share the same SEF code by default: www.mywebsite.com/en/
-	 * To avoid this conflict, this function creates an specific SEF in case of existing conflict:
+	 * To avoid this conflict, this function creates a specific SEF in case of existing conflict:
 	 * For example: www.mywebsite.com/en-au/
 	 *
 	 * @param   stdClass    $itemLanguage   Language Object.

diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini
@@ -103,6 +103,7 @@ JTRASH="Trash"
 JTRASHED="Trashed"
 JTRUE="True"
 JUNPUBLISHED="Unpublished"
+JUSER_TOOLS="User tools"
 JYEAR="Year"
 JYES="Yes"
 

diff --git a/language/en-GB/en-GB.mod_tags_popular.ini b/language/en-GB/en-GB.mod_tags_popular.ini
@@ -31,4 +31,6 @@ MOD_TAGS_POPULAR_FIELDSET_CLOUD_LABEL="Cloud Layout"
 MOD_TAGS_POPULAR_MAX_DESC="Sets the maximum number of tags to display in the module."
 MOD_TAGS_POPULAR_MAX_LABEL="Maximum Tags"
 MOD_TAGS_POPULAR_NO_ITEMS_FOUND="No Tags found."
+MOD_TAGS_POPULAR_PARENT_TAG_DESC="Limit tags shown to the children of this Parent Tag."
+MOD_TAGS_POPULAR_PARENT_TAG_LABEL="Parent Tag"
 MOD_TAGS_POPULAR_XML_DESCRIPTION="This module displays tags used on the site in a list or a cloud layout. Tags can be ordered by title or by the number of tagged items and limited to a specific time period."
diff --git a/layouts/joomla/content/icons.php b/layouts/joomla/content/icons.php
@@ -12,6 +12,7 @@
 JHtml::_('bootstrap.framework');
 
 $canEdit = $displayData['params']->get('access-edit');
+$articleId = $displayData['item']->id;
 
 ?>
 
@@ -20,9 +21,13 @@
 
 		<?php if ($canEdit || $displayData['params']->get('show_print_icon') || $displayData['params']->get('show_email_icon')) : ?>
 			<div class="btn-group pull-right">
-				<a class="btn dropdown-toggle" data-toggle="dropdown" href="#"> <span class="icon-cog"></span><span class="caret"></span> </a>
+				<button class="btn dropdown-toggle" type="button" id="dropdownMenuButton-<?php echo $articleId; ?>" aria-label="<?php echo JText::_('JUSER_TOOLS'); ?>"
+				data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+					<span class="icon-cog" aria-hidden="true"></span>
+					<span class="caret" aria-hidden="true"></span>
+				</button>
 				<?php // Note the actions class is deprecated. Use dropdown-menu instead. ?>
-				<ul class="dropdown-menu">
+				<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton-<?php echo $articleId; ?>">
 					<?php if ($displayData['params']->get('show_print_icon')) : ?>
 						<li class="print-icon"> <?php echo JHtml::_('icon.print_popup', $displayData['item'], $displayData['params']); ?> </li>
 					<?php endif; ?>

diff --git a/layouts/joomla/content/readmore.php b/layouts/joomla/content/readmore.php
@@ -11,30 +11,32 @@
 
 $params = $displayData['params'];
 $item = $displayData['item'];
+$direction = JFactory::getLanguage()->isRtl() ? 'left' : 'right';
 ?>
 
 <p class="readmore">
 	<?php if (!$params->get('access-view')) : ?>
-		<a class="btn" href="<?php echo $displayData['link']; ?>" itemprop="url" aria-label="<?php echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE'); ?> <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
-			<span class="icon-chevron-right" aria-hidden="true"></span>
+		<a class="btn" href="<?php echo $displayData['link']; ?>" itemprop="url" aria-label="<?php echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE'); ?> 
+			<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
+			<?php echo '<span class="icon-chevron-' . $direction . '" aria-hidden="true"></span>'; ?>
 			<?php echo JText::_('COM_CONTENT_REGISTER_TO_READ_MORE'); ?>
 		</a>
 	<?php elseif ($readmore = $item->alternative_readmore) : ?>
 		<a class="btn" href="<?php echo $displayData['link']; ?>" itemprop="url" aria-label="<?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
-			<span class="icon-chevron-right" aria-hidden="true"></span>
+			<?php echo '<span class="icon-chevron-' . $direction . '" aria-hidden="true"></span>'; ?> 
 			<?php echo $readmore; ?>
 			<?php if ($params->get('show_readmore_title', 0) != 0) : ?>
 				<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
 			<?php endif; ?>
 		</a>
 	<?php elseif ($params->get('show_readmore_title', 0) == 0) : ?>
 		<a class="btn" href="<?php echo $displayData['link']; ?>" itemprop="url" aria-label="<?php echo JText::_('COM_CONTENT_READ_MORE'); ?> <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
-			<span class="icon-chevron-right" aria-hidden="true"></span>
+			<?php echo '<span class="icon-chevron-' . $direction . '" aria-hidden="true"></span>'; ?> 
 			<?php echo JText::sprintf('COM_CONTENT_READ_MORE_TITLE'); ?>
 		</a>
 	<?php else : ?>
 		<a class="btn" href="<?php echo $displayData['link']; ?>" itemprop="url" aria-label="<?php echo JText::_('COM_CONTENT_READ_MORE'); ?> <?php echo htmlspecialchars($item->title, ENT_QUOTES, 'UTF-8'); ?>">
-			<span class="icon-chevron-right" aria-hidden="true"></span>
+			<?php echo '<span class="icon-chevron-' . $direction . '" aria-hidden="true"></span>'; ?> 
 			<?php echo JText::_('COM_CONTENT_READ_MORE'); ?>
 			<?php echo JHtml::_('string.truncate', $item->title, $params->get('readmore_limit')); ?>
 		</a>

diff --git a/layouts/joomla/html/tag.php b/layouts/joomla/html/tag.php
@@ -52,7 +52,7 @@
 				// Tag is greater than the minimum required chars and enter pressed
 				if (this.value && this.value.length >= " . $minTermLength . " && (event.which === 13 || event.which === 188)) {
 
-					// Search an highlighted result
+					// Search a highlighted result
 					var highlighted = $('" . $selector . "_chzn').find('li.active-result.highlighted').first();
 
 					// Add the highlighted option
@@ -83,7 +83,7 @@
 							option.text(this.value).val(customTagPrefix + this.value);
 							option.attr('selected','selected');
 
-							// Append the option an repopulate the chosen field
+							// Append the option and repopulate the chosen field
 							$('" . $selector . "').append(option);
 						}
 					}

diff --git a/libraries/classmap.php b/libraries/classmap.php
@@ -415,3 +415,7 @@
 JLoader::registerAlias('JImageFilterNegate',                '\\Joomla\\Image\\Filter\\Negate', '5.0');
 JLoader::registerAlias('JImageFilterSketchy',               '\\Joomla\\Image\\Filter\\Sketchy', '5.0');
 JLoader::registerAlias('JImageFilterSmooth',                '\\Joomla\\Image\\Filter\\Smooth', '5.0');
+
+JLoader::registerAlias('JObject',                           '\\Joomla\\CMS\\Object\\CMSObject', '5.0');
+
+JLoader::registerAlias('JExtensionHelper',                  '\\Joomla\\CMS\\Extension\\ExtensionHelper', '5.0');
diff --git a/libraries/cms/html/html.php b/libraries/cms/html/html.php
@@ -400,7 +400,7 @@ protected static function includeRelativeFiles($folder, $file, $relative, $detec
 					}
 					else
 					{
-						// If the file contains any /: it can be in an media extension subfolder
+						// If the file contains any /: it can be in a media extension subfolder
 						if (strpos($file, '/'))
 						{
 							// Divide the file extracting the extension as the first part before /

diff --git a/libraries/joomla/database/query.php b/libraries/joomla/database/query.php
@@ -1736,7 +1736,7 @@ public function format($format)
 		};
 
 		/**
-		 * Regexp to find an replace all tokens.
+		 * Regexp to find and replace all tokens.
 		 * Matched fields:
 		 * 0: Full token
 		 * 1: Everything following '%'

diff --git a/libraries/joomla/filesystem/wrapper/path.php b/libraries/joomla/filesystem/wrapper/path.php
@@ -118,7 +118,7 @@ public function isOwner($path)
 	/**
 	 * Helper wrapper method for find
 	 *
-	 * @param   mixed   $paths  An path string or array of path strings to search in
+	 * @param   mixed   $paths  A path string or array of path strings to search in
 	 * @param   string  $file   The file name to look for.
 	 *
 	 * @return mixed   The full path and file name for the target file, or boolean false if the file is not found in any of the paths.

diff --git a/libraries/joomla/form/fields/sql.php b/libraries/joomla/form/fields/sql.php
@@ -12,7 +12,7 @@
 JFormHelper::loadFieldClass('list');
 
 /**
- * Supports an custom SQL select list
+ * Supports a custom SQL select list
  *
  * @since  11.1
  */

diff --git a/libraries/src/Access/Exception/NotAllowed.php b/libraries/src/Access/Exception/NotAllowed.php
@@ -11,7 +11,7 @@
 defined('JPATH_PLATFORM') or die;
 
 /**
- * Exception class defining an not allowed access
+ * Exception class defining a not allowed access
  *
  * @since  3.6.3
  */

diff --git a/libraries/src/Document/FeedDocument.php b/libraries/src/Document/FeedDocument.php
@@ -228,7 +228,7 @@ public function render($cache = false, $params = array())
 	}
 
 	/**
-	 * Adds an FeedItem to the feed.
+	 * Adds a FeedItem to the feed.
 	 *
 	 * @param   FeedItem  $item  The feeditem to add to the feed.
 	 *