Merge branch '4.0-dev' into check-layout

joomla · Jan 31, 2018 · 8eda662 · 8eda662
2 parents 0b0ff43 + f431605
commit 8eda662
Show file tree

Hide file tree

Showing 290 changed files with 6,533 additions and 3,685 deletions.
diff --git a/.gitignore b/.gitignore
@@ -54,9 +54,6 @@ phpdoc-*
 /components/com_patchtester
 /media/com_patchtester
 
-# Install from Web plugin #
-/plugins/installer/webinstaller
-
 # Languages #
 administrator/language/*
 !administrator/language/en-GB

diff --git a/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-10-10.sql b/administrator/components/com_admin/sql/updates/mysql/4.0.0-2017-10-10.sql
@@ -0,0 +1,6 @@
+INSERT INTO `#__extensions` (`extension_id`, `name`, `type`, `element`, `folder`, `client_id`, `enabled`, `access`, `protected`, `manifest_cache`, `params`, `custom_data`, `system_data`, `checked_out`, `checked_out_time`, `ordering`, `state`) VALUES
+(487, 'plg_system_httpheader', 'plugin', 'httpheader', 'system', 0, 0, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+INSERT INTO `#__postinstall_messages` (`extension_id`, `title_key`, `description_key`, `action_key`, `language_extension`, `language_client_id`, `type`, `action_file`, `action`, `condition_file`, `condition_method`, `version_introduced`, `enabled`)
+VALUES
+(NULL, 487, 'PLG_SYSTEM_HTTPHEADER_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADER_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADER_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheader', 1, 'action', 'site://plugins/system/httpheader/postinstall/introduction.php', 'httpheader_postinstall_action', 'site://plugins/system/httpheader/postinstall/introduction.php', 'httpheader_postinstall_condition', '4.0.0', 1);
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-10-10.sql b/administrator/components/com_admin/sql/updates/postgresql/4.0.0-2017-10-10.sql
@@ -0,0 +1,6 @@
+INSERT INTO "#__extensions" ("extension_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "custom_data", "system_data", "checked_out", "checked_out_time", "ordering", "state") VALUES
+(487, 'plg_system_httpheader', 'plugin', 'httpheader', 'system', 0, 0, 1, 0, '', '{}', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+
+INSERT INTO "#__postinstall_messages" ("extension_id", "title_key", "description_key", "action_key", "language_extension", "language_client_id", "type", "action_file", "action", "condition_file", "condition_method", "version_introduced", "enabled")
+VALUES
+(NULL, 487, 'PLG_SYSTEM_HTTPHEADER_POSTINSTALL_INTRODUCTION_TITLE', 'PLG_SYSTEM_HTTPHEADER_POSTINSTALL_INTRODUCTION_BODY', 'PLG_SYSTEM_HTTPHEADER_POSTINSTALL_INTRODUCTION_ACTION', 'plg_system_httpheader', 1, 'action', 'site://plugins/system/httpheader/postinstall/introduction.php', 'httpheader_postinstall_action', 'site://plugins/system/httpheader/postinstall/introduction.php', 'httpheader_postinstall_condition', '4.0.0', 1);
diff --git a/administrator/components/com_banners/Model/TracksModel.php b/administrator/components/com_banners/Model/TracksModel.php
@@ -484,7 +484,7 @@ public function getContent()
 
 			if ($this->getState('compressed'))
 			{
-				$app = \JFactory::getApplication('administrator');
+				$app = \JFactory::getApplication();
 
 				$files = array(
 					'track' => array(

diff --git a/administrator/components/com_banners/dispatcher.php b/administrator/components/com_banners/dispatcher.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  com_content
+ * @subpackage  com_banners
  *
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

diff --git a/administrator/components/com_cache/dispatcher.php b/administrator/components/com_cache/dispatcher.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  com_content
+ * @subpackage  com_cache
  *
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

diff --git a/administrator/components/com_categories/Model/CategoryModel.php b/administrator/components/com_categories/Model/CategoryModel.php
@@ -148,7 +148,7 @@ public function getTable($type = 'Category', $prefix = 'Administrator', $config
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		$parentId = $app->input->getInt('parent_id');
 		$this->setState('category.parent_id', $parentId);

diff --git a/administrator/components/com_categories/dispatcher.php b/administrator/components/com_categories/dispatcher.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  com_content
+ * @subpackage  com_categories
  *
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

diff --git a/administrator/components/com_config/Controller/DisplayController.php b/administrator/components/com_config/Controller/DisplayController.php
@@ -11,7 +11,7 @@
 
 defined('_JEXEC') or die;
 
-use \Joomla\CMS\MVC\Controller\BaseController as BaseController;
+use Joomla\CMS\MVC\Controller\BaseController as BaseController;
 
 /**
  * Controller for global configuration

diff --git a/administrator/components/com_config/Model/ComponentModel.php b/administrator/components/com_config/Model/ComponentModel.php
@@ -14,7 +14,7 @@
 use Joomla\CMS\Access\Access as JAccess;
 use Joomla\CMS\Access\Rules as JAccessRules;
 use Joomla\CMS\Component\ComponentHelper;
-use \Joomla\CMS\MVC\Model\FormModel;
+use Joomla\CMS\MVC\Model\FormModel;
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Table\Table;
 

diff --git a/administrator/components/com_config/dispatcher.php b/administrator/components/com_config/dispatcher.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  com_content
+ * @subpackage  com_config
  *
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

diff --git a/administrator/components/com_contenthistory/Model/HistoryModel.php b/administrator/components/com_contenthistory/Model/HistoryModel.php
@@ -245,7 +245,7 @@ public function getItems()
 	 *
 	 * @since   3.2
 	 */
-	public function getTable($type = 'Contenthistory', $prefix = 'Joomla\\CMS\\Table\\', $config = array())
+	public function getTable($type = 'ContentHistory', $prefix = 'Joomla\\CMS\\Table\\', $config = array())
 	{
 		return Table::getInstance($type, $prefix, $config);
 	}
@@ -419,7 +419,7 @@ protected function getSha1Hash()
 			$helper = new CMSHelper;
 
 			$dataObject = $helper->getDataObject($contentTable);
-			$result = $this->getTable('Contenthistory')->getSha1(json_encode($dataObject), $typeTable);
+			$result = $this->getTable('ContentHistory')->getSha1(json_encode($dataObject), $typeTable);
 		}
 
 		return $result;

diff --git a/administrator/components/com_cpanel/dispatcher.php b/administrator/components/com_cpanel/dispatcher.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  com_content
+ * @subpackage  com_cpanel
  *
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

diff --git a/administrator/components/com_fields/Model/FieldModel.php b/administrator/components/com_fields/Model/FieldModel.php
@@ -834,7 +834,7 @@ protected function canEditState($record)
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');

diff --git a/administrator/components/com_finder/config.xml b/administrator/components/com_finder/config.xml
@@ -127,8 +127,8 @@
 			default="0"
 			showon="show_advanced:1"
 			>
-			<option value="1">JYES</option>
 			<option value="0">JNO</option>
+			<option value="1">JYES</option>
 		</field>
 
 		<field

diff --git a/administrator/components/com_installer/Model/InstallModel.php b/administrator/components/com_installer/Model/InstallModel.php
@@ -48,7 +48,7 @@ class InstallModel extends BaseDatabaseModel
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		$this->setState('message', $app->getUserState('com_installer.message'));
 		$this->setState('extension_message', $app->getUserState('com_installer.extension_message'));

diff --git a/administrator/components/com_installer/View/Install/HtmlView.php b/administrator/components/com_installer/View/Install/HtmlView.php
@@ -38,12 +38,8 @@ public function display($tpl = null)
 
 		$this->paths  = &$paths;
 
-		$this->showJedAndWebInstaller = ComponentHelper::getParams('com_installer')->get('show_jed_info', 1);
-
 		PluginHelper::importPlugin('installer');
 
-		\JFactory::getApplication()->triggerEvent('onInstallerBeforeDisplay', array(&$this->showJedAndWebInstaller, $this));
-
 		parent::display($tpl);
 	}
 

diff --git a/administrator/components/com_installer/tmpl/install/default.php b/administrator/components/com_installer/tmpl/install/default.php
@@ -34,21 +34,6 @@
 					<?php // Render messages set by extension install scripts here ?>
 					<?php if ($this->showMessage) : ?>
 						<?php echo $this->loadTemplate('message'); ?>
-					<?php elseif ($this->showJedAndWebInstaller) : ?>
-						<joomla-alert type="info">
-							<?php echo JHtml::_(
-								'link',
-								JRoute::_('index.php?option=com_config&view=component&component=com_installer&path=&return=' . urlencode(base64_encode(JUri::getInstance()))),
-								'',
-								'class="alert-options float-right hasTooltip icon-options" title="' . str_replace('"', '&quot;', JText::_('COM_INSTALLER_SHOW_JED_INFORMATION_TOOLTIP')) . '"'
-							);
-							?>
-							<p><?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_INFO'); ?>
-								<?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_TOS'); ?></p>
-							<button class="btn btn-primary" type="button" onclick="Joomla.submitbuttonInstallWebInstaller()">
-								<?php echo JText::_('COM_INSTALLER_INSTALL_FROM_WEB_ADD_TAB'); ?>
-							</button>
-						</joomla-alert>
 					<?php endif; ?>
 					<?php // Show installation tabs at the start ?>
 					<?php $firstTab = $app->triggerEvent('onInstallerViewBeforeFirstTab', array()); ?>

diff --git a/administrator/components/com_languages/Model/LanguageModel.php b/administrator/components/com_languages/Model/LanguageModel.php
@@ -76,7 +76,7 @@ public function getTable($name = '', $prefix = '', $options = array())
 	 */
 	protected function populateState()
 	{
-		$app    = \JFactory::getApplication('administrator');
+		$app    = \JFactory::getApplication();
 		$params = ComponentHelper::getParams('com_languages');
 
 		// Load the User state.

diff --git a/administrator/components/com_menus/Model/ItemModel.php b/administrator/components/com_menus/Model/ItemModel.php
@@ -943,7 +943,7 @@ protected function getReorderConditions($table)
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');

diff --git a/administrator/components/com_menus/Model/ItemsModel.php b/administrator/components/com_menus/Model/ItemsModel.php
@@ -80,7 +80,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	 */
 	protected function populateState($ordering = 'a.lft', $direction = 'asc')
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		$forcedLanguage = $app->input->get('forcedLanguage', '', 'cmd');
 

diff --git a/administrator/components/com_menus/Model/MenuModel.php b/administrator/components/com_menus/Model/MenuModel.php
@@ -93,7 +93,7 @@ public function getTable($type = 'MenuType', $prefix = '\JTable', $config = arra
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$id = $app->input->getInt('id');

diff --git a/administrator/components/com_menus/models/fields/menuitembytype.php b/administrator/components/com_menus/models/fields/menuitembytype.php
@@ -151,7 +151,7 @@ public function setup(SimpleXMLElement $element, $value, $group = null)
 
 			if (!$menuType)
 			{
-				$app = JFactory::getApplication('administrator');
+				$app = JFactory::getApplication();
 				$currentMenuType = $app->getUserState('com_menus.items.menutype', '');
 				$menuType        = $app->input->getString('menutype', $currentMenuType);
 			}

diff --git a/administrator/components/com_messages/Model/MessageModel.php b/administrator/components/com_messages/Model/MessageModel.php
@@ -311,7 +311,7 @@ public function save($data)
 		}
 
 		// Load the recipient user configuration.
-		$model  = new Config(array('ignore_request' => true));
+		$model  = new ConfigModel(array('ignore_request' => true));
 		$model->setState('user.id', $table->user_id_to);
 		$config = $model->getItem();
 

diff --git a/administrator/components/com_modules/Model/ModuleModel.php b/administrator/components/com_modules/Model/ModuleModel.php
@@ -105,7 +105,7 @@ public function __construct($config = array())
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');

diff --git a/administrator/components/com_modules/Model/SelectModel.php b/administrator/components/com_modules/Model/SelectModel.php
@@ -36,7 +36,7 @@ class SelectModel extends ListModel
 	 */
 	protected function populateState($ordering = null, $direction = null)
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the filter state.
 		$clientId = $app->getUserState('com_modules.modules.client_id', 0);

diff --git a/administrator/components/com_modules/dispatcher.php b/administrator/components/com_modules/dispatcher.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  com_contact
+ * @subpackage  com_modules
  *
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

diff --git a/administrator/components/com_plugins/Model/PluginModel.php b/administrator/components/com_plugins/Model/PluginModel.php
@@ -222,7 +222,7 @@ protected function populateState()
 		// Execute the parent method.
 		parent::populateState();
 
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('extension_id');

diff --git a/administrator/components/com_postinstall/dispatcher.php b/administrator/components/com_postinstall/dispatcher.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * @package     Joomla.Administrator
- * @subpackage  com_content
+ * @subpackage  com_postinstall
  *
  * @copyright   Copyright (C) 2005 - 2017 Open Source Matters, Inc. All rights reserved.
  * @license     GNU General Public License version 2 or later; see LICENSE.txt

diff --git a/administrator/components/com_tags/Model/TagModel.php b/administrator/components/com_tags/Model/TagModel.php
@@ -94,7 +94,7 @@ protected function canEditState($record)
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		$parentId = $app->input->getInt('parent_id');
 		$this->setState('tag.parent_id', $parentId);

diff --git a/administrator/components/com_templates/Controller/TemplateController.php b/administrator/components/com_templates/Controller/TemplateController.php
@@ -10,10 +10,9 @@
 
 defined('_JEXEC') or die;
 
-\JLoader::register('InstallerModelInstall', JPATH_ADMINISTRATOR . '/components/com_installer/models/install.php');
-
 use Joomla\CMS\MVC\Controller\BaseController;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
+use Joomla\Component\Installer\Administrator\Model\InstallModel;
 
 /**
  * Template style controller class.
@@ -146,7 +145,7 @@ public function copy()
 
 			// Call installation model
 			$this->input->set('install_directory', \JFactory::getConfig()->get('tmp_path') . '/' . $model->getState('tmp_prefix'));
-			$installModel = new \InstallerModelInstall;
+			$installModel = new InstallModel;
 			\JFactory::getLanguage()->load('com_installer');
 
 			if (!$installModel->install())

diff --git a/administrator/components/com_templates/Model/StyleModel.php b/administrator/components/com_templates/Model/StyleModel.php
@@ -86,7 +86,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	 */
 	protected function populateState()
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');

diff --git a/administrator/components/com_templates/Model/TemplateModel.php b/administrator/components/com_templates/Model/TemplateModel.php
@@ -160,7 +160,7 @@ public function getDirectoryTree($dir)
 	protected function populateState()
 	{
 		jimport('joomla.filesystem.file');
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Load the User state.
 		$pk = $app->input->getInt('id');

diff --git a/administrator/components/com_users/Model/DebuggroupModel.php b/administrator/components/com_users/Model/DebuggroupModel.php
@@ -118,7 +118,7 @@ public function getItems()
 	 */
 	protected function populateState($ordering = 'a.lft', $direction = 'asc')
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Adjust the context to support modal layouts.
 		$layout = $app->input->get('layout', 'default');

diff --git a/administrator/components/com_users/Model/DebuguserModel.php b/administrator/components/com_users/Model/DebuguserModel.php
@@ -118,7 +118,7 @@ public function getItems()
 	 */
 	protected function populateState($ordering = 'a.lft', $direction = 'asc')
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Adjust the context to support modal layouts.
 		$layout = $app->input->get('layout', 'default');

diff --git a/administrator/components/com_users/Model/UsersModel.php b/administrator/components/com_users/Model/UsersModel.php
@@ -70,7 +70,7 @@ public function __construct($config = array(), MVCFactoryInterface $factory = nu
 	 */
 	protected function populateState($ordering = 'a.name', $direction = 'asc')
 	{
-		$app = \JFactory::getApplication('administrator');
+		$app = \JFactory::getApplication();
 
 		// Adjust the context to support modal layouts.
 		if ($layout = $app->input->get('layout', 'default', 'cmd'))

diff --git a/administrator/language/en-GB/en-GB.com_installer.ini b/administrator/language/en-GB/en-GB.com_installer.ini
@@ -68,9 +68,6 @@ COM_INSTALLER_INSTALL_ERROR="Error installing %s"
 COM_INSTALLER_INSTALL_FROM_DIRECTORY="Install from Folder"
 COM_INSTALLER_INSTALL_FROM_URL="Install from URL"
 COM_INSTALLER_INSTALL_FROM_WEB="Install from Web"
-COM_INSTALLER_INSTALL_FROM_WEB_ADD_TAB="Add &quot;Install from Web&quot; tab"
-COM_INSTALLER_INSTALL_FROM_WEB_INFO="<a class=\"alert-link\" href=\"https://extensions.joomla.org\" target=\"_blank\">Joomla! Extensions Directory&trade; (JED)</a> now available with <a class=\"alert-link\" href=\"https://docs.joomla.org/Special:MyLanguage/Install_from_Web\" target=\"_blank\">Install from Web</a> on this page."
-COM_INSTALLER_INSTALL_FROM_WEB_TOS="By selecting \"Add Install from Web tab\" below, you agree to the JED <a class=\"alert-link\" href=\"https://extensions.joomla.org/tos\" target=\"_blank\">Terms of Service</a> and all applicable third party license terms."
 COM_INSTALLER_INSTALL_LANGUAGE_SUCCESS="Installation of the <strong>%s</strong> language was successful."
 COM_INSTALLER_INSTALL_SUCCESS="Installation of the %s was successful."
 COM_INSTALLER_INSTALL_URL="Install URL"

diff --git a/administrator/language/en-GB/en-GB.com_newsfeeds.ini b/administrator/language/en-GB/en-GB.com_newsfeeds.ini
@@ -53,7 +53,7 @@ COM_NEWSFEEDS_FLOAT_FIRST_LABEL="First Image Float"
 COM_NEWSFEEDS_FLOAT_LABEL="Image Float"
 COM_NEWSFEEDS_FLOAT_SECOND_LABEL="Second Image Float"
 COM_NEWSFEEDS_HEADING_ASSOCIATION="Association"
-sCOM_NEWSFEEDS_LEFT="Left"
+COM_NEWSFEEDS_LEFT="Left"
 COM_NEWSFEEDS_MANAGER_NEWSFEED_NEW="News Feeds: New"
 COM_NEWSFEEDS_MANAGER_NEWSFEED_EDIT="News Feeds: Edit"
 COM_NEWSFEEDS_MANAGER_NEWSFEEDS="News Feeds"

diff --git a/administrator/language/en-GB/en-GB.plg_fields_textarea.ini b/administrator/language/en-GB/en-GB.plg_fields_textarea.ini
@@ -5,7 +5,6 @@
 
 PLG_FIELDS_TEXTAREA="Fields - Textarea"
 PLG_FIELDS_TEXTAREA_LABEL="Text Area (%s)"
-c="Columns"
 PLG_FIELDS_TEXTAREA_PARAMS_COLS_LABEL="Columns"
 PLG_FIELDS_TEXTAREA_PARAMS_FILTER_LABEL="Filter"
 PLG_FIELDS_TEXTAREA_PARAMS_MAXLENGTH_LABEL="Maximum Length (characters)"

diff --git a/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini b/administrator/language/en-GB/en-GB.plg_installer_webinstaller.ini
@@ -4,9 +4,4 @@
 ; Note : All ini files need to be saved as UTF-8
 
 PLG_INSTALLER_WEBINSTALLER="Installer - Install from Web"
-PLG_INSTALLER_WEBINSTALLER_LOAD_APPS="Display the extensions"
-PLG_INSTALLER_WEBINSTALLER_TAB_POSITION_DESC="Place the Install from Web tab first or last."
-PLG_INSTALLER_WEBINSTALLER_TAB_POSITION_LABEL="Tab Position"
-PLG_INSTALLER_WEBINSTALLER_TAB_POSITION_FIRST="First"
-PLG_INSTALLER_WEBINSTALLER_TAB_POSITION_LAST="Last"
-PLG_INSTALLER_WEBINSTALLER_XML_DESCRIPTION="This plugin offers functionality for the 'Install from Web' tab."
+PLG_INSTALLER_WEBINSTALLER_XML_DESCRIPTION="This plugin allows you to install directly from the Joomla! Extension Directory."