pull latest commits from current joomla staging

.travis.yml

@@ -1,3 +1,6 @@
+# Forces new Travis-CI Infrastructure
+sudo: false
+
 language: php
 
 php:
@@ -27,8 +30,10 @@ before_script:
   # - ./build/travis/php-apache.sh
   # Enable additional PHP extensions
   - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then phpenv config-add build/travis/phpenv/memcached.ini; fi"
-  - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi"
+  - sh -c "if [ '$TRAVIS_PHP_VERSION' == '5.3' ] || [ '$TRAVIS_PHP_VERSION' == '5.4' ]; then phpenv config-add build/travis/phpenv/apc-$TRAVIS_PHP_VERSION.ini; fi"
   - sh -c "if [ '$TRAVIS_PHP_VERSION' != '7.0' ]; then phpenv config-add build/travis/phpenv/redis.ini; fi"
+  # PHP 5.5+ needs APCu
+  - if [ '$TRAVIS_PHP_VERSION' == "5.5" ] || [ '$TRAVIS_PHP_VERSION' == "5.6" ]; then printf "\n" | echo -e "extension = apcu.so\napc.enabled=1\napc.enable_cli=1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
 
 script:
   - libraries/vendor/bin/phpunit --configuration travisci-phpunit.xml

administrator/includes/toolbar.php

@@ -37,7 +37,7 @@ public static function title($title, $icon = 'generic.png')
 
 		$app = JFactory::getApplication();
 		$app->JComponentTitle = $html;
-		JFactory::getDocument()->setTitle($app->get('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - ' . $title);
+		JFactory::getDocument()->setTitle($app->get('sitename') . ' - ' . JText::_('JADMINISTRATION') . ' - ' . strip_tags($title));
 	}
 
 	/**

administrator/language/en-GB/en-GB.com_admin.ini

@@ -3,7 +3,7 @@
 ; 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
 
-COM_ADMIN="Admin - System Information"
+COM_ADMIN="Administrator - System Information"
 COM_ADMIN_ALPHABETICAL_INDEX="Alphabetical Index"
 COM_ADMIN_CACHE_DIRECTORY="(Cache Directory)"
 COM_ADMIN_CLEAR_RESULTS="Clear results"

administrator/language/en-GB/en-GB.com_admin.sys.ini

@@ -3,5 +3,5 @@
 ; 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
 
-COM_ADMIN="Admin - System Information"
+COM_ADMIN="Administrator - System Information"
 COM_ADMIN_XML_DESCRIPTION="Administration system information component."

administrator/language/en-GB/en-GB.com_banners.ini

@@ -66,7 +66,7 @@ COM_BANNERS_FIELD_BANNEROWNPREFIX_LABEL="Use Own Prefix"
 COM_BANNERS_FIELD_BASENAME_DESC="File name pattern which can contain<br />__SITE__ for the site name<br />__CATID__ for the category ID<br />__CATNAME__ for the category name<br />__CLIENTID__ for the client ID<br />__CLIENTNAME__ for the client name<br />__TYPE__ for the type<br />__TYPENAME__ for the type name<br />__BEGIN__ for the begin date<br />__END__ for the end date."
 COM_BANNERS_FIELD_BASENAME_LABEL="File Name"
 COM_BANNERS_FIELD_CATEGORY_DESC="Choose a category for this banner."
-COM_BANNERS_FIELD_CLICKS_DESC="Displays the number of clicks on the banner. Click on reset if desired."
+COM_BANNERS_FIELD_CLICKS_DESC="Displays the number of clicks on the banner. Select reset if desired."
 COM_BANNERS_FIELD_CLICKS_LABEL="Total Clicks"
 COM_BANNERS_FIELD_CLICKURL_DESC="The URL used when the banner is clicked on."
 COM_BANNERS_FIELD_CLICKURL_LABEL="Click URL"
@@ -218,5 +218,5 @@ COM_BANNERS_TYPE1="Impressions"
 COM_BANNERS_TYPE2="Clicks"
 COM_BANNERS_UNLIMITED="Unlimited"
 COM_BANNERS_XML_DESCRIPTION="This component manages banners and banner clients."
-JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:<br /><em>Inherited</em> means that the permissions from global configuration and parent group will be used.<br /><em>Denied</em> means that no matter what the global configuration or parent group settings are, the group being edited can't take this action on this component.<br /><em>Allowed</em> means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by <em>Not Allowed (Locked)</em> under Calculated Settings).<br />2. If you select a new setting, click <em>Save</em> to refresh the calculated settings."
+JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:<br /><em>Inherited</em> means that the permissions from global configuration and parent group will be used.<br /><em>Denied</em> means that no matter what the global configuration or parent group settings are, the group being edited can't take this action on this component.<br /><em>Allowed</em> means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by <em>Not Allowed (Locked)</em> under Calculated Settings).<br />2. If you select a new setting, select <em>Save</em> to refresh the calculated settings."
 

administrator/language/en-GB/en-GB.com_cache.ini

@@ -5,7 +5,7 @@
 
 COM_CACHE="Cache Manager"
 COM_CACHE_BACK_CACHE_MANAGER="Return to Cache Manager"
-COM_CACHE_CLEAR_CACHE_ADMIN="Clear Cache Admin"
+COM_CACHE_CLEAR_CACHE_ADMIN="Clear Cache Administrator"
 COM_CACHE_CLEAR_CACHE="Maintenance: Clear Cache"
 COM_CACHE_PURGE_EXPIRED_CACHE="Maintenance: Clear Expired Cache"
 COM_CACHE_CONFIGURATION="Cache Manager Settings"
@@ -14,12 +14,12 @@ COM_CACHE_EXPIRED_ITEMS_PURGING_ERROR="Error clearing expired items."
 COM_CACHE_GROUP="Cache Group"
 COM_CACHE_MANAGER="Cache Manager"
 COM_CACHE_NUMBER_OF_FILES="Number of Files"
-COM_CACHE_PURGE_CACHE_ADMIN="Clear Cache Admin"
+COM_CACHE_PURGE_CACHE_ADMIN="Clear Cache Administrator"
 COM_CACHE_PURGE_EXPIRED="Clear Expired Cache"
 COM_CACHE_PURGE_EXPIRED_ITEMS="Clear expired items"
-COM_CACHE_PURGE_INSTRUCTIONS="Click on the Clear Expired Cache icon in the toolbar to delete all expired cache files. Note: Cache files that are still current will not be deleted."
+COM_CACHE_PURGE_INSTRUCTIONS="Select the Clear Expired Cache icon in the toolbar to delete all expired cache files. Note: Cache files that are still current will not be deleted."
 COM_CACHE_RESOURCE_INTENSIVE_WARNING="WARNING: This can be resource intensive on sites with a large number of items!"
 COM_CACHE_SIZE="Size"
 COM_CACHE_SELECT_CLIENT="- Select Location -"
 COM_CACHE_XML_DESCRIPTION="Component for cache management."
-JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:<br /><em>Inherited</em> means that the permissions from global configuration and parent group will be used.<br /><em>Denied</em> means that no matter what the global configuration or parent group settings are, the group being edited can't take this action on this component.<br /><em>Allowed</em> means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by <em>Not Allowed (Locked)</em> under Calculated Settings).<br />2. If you select a new setting, click <em>Save</em> to refresh the calculated settings."
+JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:<br /><em>Inherited</em> means that the permissions from global configuration and parent group will be used.<br /><em>Denied</em> means that no matter what the global configuration or parent group settings are, the group being edited can't take this action on this component.<br /><em>Allowed</em> means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by <em>Not Allowed (Locked)</em> under Calculated Settings).<br />2. If you select a new setting, select <em>Save</em> to refresh the calculated settings."

administrator/language/en-GB/en-GB.com_categories.ini

@@ -73,5 +73,5 @@ COM_CATEGORIES_TIP_ASSOCIATION="Associated categories"
 COM_CATEGORIES_TIP_ASSOCIATED_LANGUAGE="%s %s"
 COM_CATEGORIES_XML_DESCRIPTION="This component manages categories."
 JGLOBAL_NO_ITEM_SELECTED="No categories selected."
-JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the permission settings for this category. Click the tabs above to customise these settings by action."
-JLIB_RULES_SETTING_NOTES_ITEM="1. If you change the setting, it will apply to this and all child categories. Note that:<br /><em>Inherited</em> means that the permissions from the parent category will be used if there is a parent category or those from the component if there is no parent category.<br /><em>Denied</em> means that no matter what the parent category setting is, the group being edited can't take this action within this category.<br /><em>Allowed</em> means that the group being edited will be able to take this action within this category (but if this is in conflict with the parent category setting or the component setting it will have no impact; a conflict will be indicated by <em>Not Allowed (Locked)</em> under Calculated Settings).<br />2. If you select a new setting, click <em>Save</em> to refresh the calculated settings."
+JLIB_HTML_ACCESS_SUMMARY_DESC="Shown below is an overview of the permission settings for this category. Select the tabs above to customise these settings by action."
+JLIB_RULES_SETTING_NOTES_ITEM="1. If you change the setting, it will apply to this and all child categories. Note that:<br /><em>Inherited</em> means that the permissions from the parent category will be used if there is a parent category or those from the component if there is no parent category.<br /><em>Denied</em> means that no matter what the parent category setting is, the group being edited can't take this action within this category.<br /><em>Allowed</em> means that the group being edited will be able to take this action within this category (but if this is in conflict with the parent category setting or the component setting it will have no impact; a conflict will be indicated by <em>Not Allowed (Locked)</em> under Calculated Settings).<br />2. If you select a new setting, select <em>Save</em> to refresh the calculated settings."

administrator/language/en-GB/en-GB.com_checkin.ini

@@ -14,4 +14,4 @@ COM_CHECKIN_N_ITEMS_CHECKED_IN_1="1 item checked in."
 COM_CHECKIN_N_ITEMS_CHECKED_IN_MORE="%s items checked in."
 COM_CHECKIN_TABLE="<em>%s</em> table"
 COM_CHECKIN_XML_DESCRIPTION="Check-in Component."
-JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:<br /><em>Inherited</em> means that the permissions from global configuration and parent group will be used.<br /><em>Denied</em> means that no matter what the global configuration or parent group settings are, the group being edited can't take this action on this component.<br /><em>Allowed</em> means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by <em>Not Allowed (Locked)</em> under Calculated Settings).<br />2. If you select a new setting, click <em>Save</em> to refresh the calculated settings."
+JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:<br /><em>Inherited</em> means that the permissions from global configuration and parent group will be used.<br /><em>Denied</em> means that no matter what the global configuration or parent group settings are, the group being edited can't take this action on this component.<br /><em>Allowed</em> means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by <em>Not Allowed (Locked)</em> under Calculated Settings).<br />2. If you select a new setting, select <em>Save</em> to refresh the calculated settings."

administrator/language/en-GB/en-GB.com_config.ini

@@ -76,7 +76,7 @@ COM_CONFIG_FIELD_FILTERS_WHITE_LIST="White List"
 COM_CONFIG_FRONTEDITING_DESC="Select if you want mouse-over edit icons for modules and menu items (support may depend on your template)."
 COM_CONFIG_FRONTEDITING_LABEL="Mouse-over Edit Icons for"
 COM_CONFIG_FRONTEDITING_MENUSANDMODULES="Modules & Menus"
-COM_CONFIG_FRONTEDITING_MENUSANDMODULES_ADMIN_TOO="Modules & Menus (admin too)"
+COM_CONFIG_FRONTEDITING_MENUSANDMODULES_ADMIN_TOO="Modules & Menus (administrator too)"
 COM_CONFIG_FRONTEDITING_MODULES="Modules"
 COM_CONFIG_FIELD_FORCE_SSL_DESC="Force site access to always occur under SSL (https) for selected areas. You will not be able to access selected areas under non-ssl. Note, you must have SSL enabled on your server to utilise this option."
 COM_CONFIG_FIELD_FORCE_SSL_LABEL="Force SSL"
@@ -235,4 +235,4 @@ COM_CONFIG_TEXT_FILTER_SETTINGS="Text Filter Settings"
 COM_CONFIG_TEXT_FILTERS="Text Filters"
 COM_CONFIG_TEXT_FILTERS_DESC="These text filter settings will be applied to all text editor fields submitted by users in the selected groups.<br />These filtering options give more control over the HTML your content providers submit. You can be as strict or as liberal as you require to suit your site needs. The filtering is opt-in and the default settings provide good protection against markup commonly associated with website attacks."
 COM_CONFIG_XML_DESCRIPTION="Configuration Manager"
-JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this and all child groups, components and content. Note that:<br /><em>Inherited</em> means that the permissions from the parent group will be used.<br /><em>Denied</em> means that no matter what the parent group's setting is, the group being edited can't take this action.<br /><em>Allowed</em> means that the group being edited will be able to take this action (but if this is in conflict with the parent group it will have no impact; a conflict will be indicated by <em>Not Allowed (Locked)</em> under Calculated Settings).<br /><em>Not Set</em> is used only for the Public group in global configuration. The Public group is the parent of all other groups. If a permission is not set, it is treated as deny but can be changed for child groups, components, categories and items.<br />2. If you select a new setting, click <em>Save</em> to refresh the calculated settings."
+JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this and all child groups, components and content. Note that:<br /><em>Inherited</em> means that the permissions from the parent group will be used.<br /><em>Denied</em> means that no matter what the parent group's setting is, the group being edited can't take this action.<br /><em>Allowed</em> means that the group being edited will be able to take this action (but if this is in conflict with the parent group it will have no impact; a conflict will be indicated by <em>Not Allowed (Locked)</em> under Calculated Settings).<br /><em>Not Set</em> is used only for the Public group in global configuration. The Public group is the parent of all other groups. If a permission is not set, it is treated as deny but can be changed for child groups, components, categories and items.<br />2. If you select a new setting, select <em>Save</em> to refresh the calculated settings."

administrator/language/en-GB/en-GB.com_contact.ini

@@ -286,4 +286,4 @@ COM_CONTACT_XML_DESCRIPTION="This component shows a listing of contact informati
 JGLOBAL_FIELDSET_MISCELLANEOUS="Miscellaneous Information"
 JGLOBAL_NEWITEMSLAST_DESC="New Contacts default to the last position. Ordering can be changed after this Contact is saved."
 JLIB_HTML_BATCH_USER_LABEL="Set Linked User"
-JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:<br /><em>Inherited</em> means that the permissions from global configuration and parent group will be used.<br /><em>Denied</em> means that no matter what the global configuration or parent group settings are, the group being edited can't take this action on this component.<br /><em>Allowed</em> means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by <em>Not Allowed (Locked)</em> under Calculated Settings).<br />2. If you select a new setting, click <em>Save</em> to refresh the calculated settings."
+JLIB_RULES_SETTING_NOTES="1. If you change the setting, it will apply to this component. Note that:<br /><em>Inherited</em> means that the permissions from global configuration and parent group will be used.<br /><em>Denied</em> means that no matter what the global configuration or parent group settings are, the group being edited can't take this action on this component.<br /><em>Allowed</em> means that the group being edited will be able to take this action for this component (but if this is in conflict with the global configuration or parent group it will have no impact; a conflict will be indicated by <em>Not Allowed (Locked)</em> under Calculated Settings).<br />2. If you select a new setting, select <em>Save</em> to refresh the calculated settings."