Merge branch 'staging' into patch-16

.gitignore

@@ -7,8 +7,8 @@
 
 # Local System Files (i.e. cache, logs, etc.) #
 /administrator/cache
+/administrator/logs
 /cache
-/logs
 /tmp
 /configuration.php
 /.htaccess

administrator/components/com_admin/models/sysinfo.php

@@ -611,12 +611,16 @@ public function getDirectory($public = false)
 
 		if ($public)
 		{
-			$this->addDirectory('log', $registry->get('log_path', JPATH_ROOT . '/log'), 'COM_ADMIN_LOG_DIRECTORY');
+			$this->addDirectory('log', $registry->get('log_path', JPATH_ADMINISTRATOR . '/logs'), 'COM_ADMIN_LOG_DIRECTORY');
 			$this->addDirectory('tmp', $registry->get('tmp_path', JPATH_ROOT . '/tmp'), 'COM_ADMIN_TEMP_DIRECTORY');
 		}
 		else
 		{
-			$this->addDirectory($registry->get('log_path', JPATH_ROOT . '/log'), $registry->get('log_path', JPATH_ROOT . '/log'), 'COM_ADMIN_LOG_DIRECTORY');
+			$this->addDirectory(
+				$registry->get('log_path', JPATH_ADMINISTRATOR . '/logs'),
+				$registry->get('log_path', JPATH_ADMINISTRATOR . '/logs'),
+				'COM_ADMIN_LOG_DIRECTORY'
+			);
 			$this->addDirectory($registry->get('tmp_path', JPATH_ROOT . '/tmp'), $registry->get('tmp_path', JPATH_ROOT . '/tmp'), 'COM_ADMIN_TEMP_DIRECTORY');
 		}
 

administrator/components/com_admin/sql/updates/mysql/3.6.0-2016-04-08.sql

@@ -1,6 +1,14 @@
 -- Insert the missing en-GB package extension.
 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 (801, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
+ VALUES (802, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '0000-00-00 00:00:00', 0, 0);
 
 -- Change update site extension id to the new extension.
-UPDATE `#__update_sites_extensions` SET `extension_id` = 801 WHERE `update_site_id` = 3 AND `extension_id` = 600;
+UPDATE `#__update_sites_extensions`
+SET `extension_id` = 802
+WHERE `update_site_id` IN (
+			SELECT `update_site_id`
+			FROM `#__update_sites`
+			WHERE `name` = 'Accredited Joomla! Translations'
+			AND `type` = 'collection'
+			)
+AND `extension_id` = 600;

administrator/components/com_admin/sql/updates/postgresql/3.6.0-2016-04-08.sql

@@ -1,4 +1,12 @@
 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
-(801, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
+(802, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1970-01-01 00:00:00', 0, 0);
 
-UPDATE "#__update_sites_extensions" SET "extension_id" = 801 WHERE "update_site_id" = 3 AND "extension_id" = 600;
+UPDATE "#__update_sites_extensions"
+SET "extension_id" = 802
+WHERE "update_site_id" IN (
+			SELECT "update_site_id"
+			FROM "#__update_sites"
+			WHERE "name" = 'Accredited Joomla! Translations'
+			AND "type" = 'collection'
+			)
+AND "extension_id" = 600;

administrator/components/com_admin/sql/updates/sqlazure/3.6.0-2016-04-08.sql

@@ -1,8 +1,16 @@
 SET IDENTITY_INSERT [#__extensions]  ON;
 
 INSERT [#__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])
-SELECT 801, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
+SELECT 802, 'English (United Kingdom)', 'package', 'pkg_en-GB', '', 0, 1, 1, 1, '', '', '', '', 0, '1900-01-01 00:00:00', 0, 0;
 
 SET IDENTITY_INSERT [#__extensions]  OFF;
 
-UPDATE [#__update_sites_extensions] SET [extension_id] = 801 WHERE [update_site_id] = 3 AND [extension_id] = 600;
+UPDATE [#__update_sites_extensions]
+SET [extension_id] = 802
+WHERE [update_site_id] IN (
+			SELECT [update_site_id]
+			FROM [#__update_sites]
+			WHERE [name] = 'Accredited Joomla! Translations'
+			AND [type] = 'collection'
+			)
+AND [extension_id] = 600;

administrator/components/com_modules/views/module/tmpl/modal.php

@@ -10,15 +10,6 @@
 defined('_JEXEC') or die;
 
 JHtml::_('bootstrap.tooltip', '.hasTooltip', array('placement' => 'bottom'));
-
-// This code is needed for proper check out in case of modal close
-JFactory::getDocument()->addScriptDeclaration('
-	window.parent.jQuery(".modal").on("hidden", function () {
-	if (typeof window.parent.jQuery("#module' . $this->item->id . 'Modal iframe").contents().find("#closeBtn") !== "undefined") {
-		window.parent.jQuery("#module' . $this->item->id . 'Modal iframe").contents().find("#closeBtn").click();
-		}
-	});
-');
 ?>
 <button id="saveBtn" type="button" class="hidden" onclick="Joomla.submitbutton('module.save');"></button>
 <button id="closeBtn" type="button" class="hidden" onclick="Joomla.submitbutton('module.cancel');"></button>

administrator/manifests/files/joomla.xml

@@ -33,7 +33,6 @@
 			<folder>language</folder>
 			<folder>layouts</folder>
 			<folder>libraries</folder>
-			<folder>logs</folder>
 			<folder>media</folder>
 			<folder>modules</folder>
 			<folder>plugins</folder>

administrator/modules/mod_status/tmpl/default.php

@@ -28,7 +28,7 @@
 if ($params->get('show_viewadmin', 0))
 {
 	$output[] = '<div class="btn-group viewsite">'
-		. '<a href="' . JURI::base() . 'index.php" target="_blank">'
+		. '<a href="' . JUri::base() . 'index.php" target="_blank">'
 		. '<span class="icon-out-2"></span>' . JText::_('MOD_STATUS_FIELD_LINK_VIEWADMIN_LABEL')
 		. '</a>'
 		. '</div>'

build/build.php

@@ -89,7 +89,6 @@
 	"language/index.html\n" => true,
 	"layouts/index.html\n" => true,
 	"libraries/index.html\n" => true,
-	"logs/index.html\n" => true,
 	"media/index.html\n" => true,
 	"modules/index.html\n" => true,
 	"plugins/index.html\n" => true,
@@ -126,6 +125,7 @@
  * These paths are from the repository root without the leading slash
  */
 $doNotPatch = array(
+	'administrator/logs',
 	'installation',
 	'images',
 );
@@ -224,8 +224,9 @@
 
 system('zip -r ../packages_full' . $fullVersion . '/Joomla_' . $fullVersion . '-' . $packageStability . '-Full_Package.zip * > /dev/null');
 
-// Create full update file without installation folder or sample images.
+// Create full update file without the default logs directory, installation folder, or sample images.
 echo "Build full update package.\n";
+system('rm -r administrator/logs');
 system('rm -r installation');
 system('rm -r images/banners');
 system('rm -r images/headers');

components/com_users/controllers/user.php

@@ -276,7 +276,7 @@ public function menulogout()
 		else
 		{
 			// URL to redirect after logout, default page if no ItemID is set
-			$url = $itemid ? 'index.php?Itemid=' . $itemid : JURI::root();
+			$url = $itemid ? 'index.php?Itemid=' . $itemid : JUri::root();
 		}
 
 		// Logout and redirect

installation/language/af-ZA/af-ZA.ini

@@ -56,9 +56,9 @@ INSTL_DATABASE_USER_DESC="Gewoonlik is dit iets soos "root" of 'n gebr
 INSTL_DATABASE_NAME_DESC="Party bedieners laat net 'n beperkte aantal databasisse op 'n rekening toe. As dit die geval is, gebruik die Tabel-Voorvoegsel opsie in die Gevorderde Parameters afdeling sodat jy meer as een Joomla! webwerf op jou bediener kan huisves."
 INSTL_DATABASE_NAME_INVALID_SPACES="MySQL databasis name en tabelname mag nie met spasies begin of eindig nie."
 INSTL_DATABASE_NAME_TOO_LONG="Die MySQL databasis naam mag 'n maksimum van 64 karakters hê."
-INSTL_DATABASE_OLD_PROCESS_DESC="Enige bestaande, gerugsteunde tabelle van vorige Joomla! installasies sal oorskryf word"
+INSTL_DATABASE_OLD_PROCESS_DESC="Rugsteun of verwyder enige bestaande tabelle van vorige Joomla! installasies wat dieselfde voorvoegsel het"
 INSTL_DATABASE_PASSWORD_DESC="Vir jou werf se sekuriteit is 'n wagwoord vir die MySQL-rekening vereis."
-INSTL_DATABASE_PREFIX_DESC="Kies 'n databasis voorvoegsel of gebruik die <b>willekeurig-genereerde</b> voorvoegsel. Die ideale voorvoegsel is drie of vier karakters lank, bevat slegs alfanumeriese karakters, en MOET met 'n onderstrepie eindig. <b>Maak asb. seker dat die gekose voervoegel nie reeds deur ander tabelle in die databasis gebruik is nie</b>."
+INSTL_DATABASE_PREFIX_DESC="Kies 'n databasis voorvoegsel of gebruik die <b>willekeurig-genereerde</b> voorvoegsel. Die ideale voorvoegsel is vier of vyf karakters lank, bevat slegs alfanumeriese karakters, en MOET met 'n onderstrepie eindig. <b>Maak asb. seker dat die gekose voervoegel nie reeds deur ander tabelle in die databasis gebruik is nie</b>."
 INSTL_DATABASE_COULD_NOT_REFRESH_MANIFEST_CACHE="Kon nie die manifes-kas vervars nie vir ektensie: %s"
 INSTL_DATABASE_PREFIX_MSG="Die tabel-voorvoegsel moet met 'n letter begin, en moet dan deur 'n optionele alfanumeriese karakter en 'n onderstrepie gevolg word"
 INSTL_DATABASE_SUPPORT="Databasis Ondersteuning:"
@@ -301,3 +301,6 @@ SQLSRV="Microsoft SQL Server"
 
 INSTL_DATABASE_FIX_LOWERCASE="Die tabel-voorvoegsel moet in kleinletters wees vir PostgreSQL."
 
+INSTL_LANGUAGES_COLUMN_HEADER_LANGUAGE_TAG="Taal Etiket"
+INSTL_MCRYPT_SUPPORT_AVAILABLE="Mcrypt Ondersteuning"
+INSTL_NOTICEMCRYPTNOTAVAILABLE="Waarskuwing! Die PHP mcrypt ekstensie moet geinstaller in ontsper word. Daarsonder sal sekere aspekte van Joomla nie werk nie.."

installation/language/af-ZA/af-ZA.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metafile version="3.6" client="installation">
   <name>Afrikaans (Suid-Afrika)</name>
-  <version>3.5.0.1</version>
-  <creationDate>2016.02.02</creationDate>
+  <version>3.6.0</version>
+  <creationDate>2016.05.11</creationDate>
   <author>Joomla4Africa Project</author>
   <copyright>Copyright (C) 2005 - 2016 Open Source Matters. All rights reserved.</copyright>
   <license>http://www.gnu.org/licenses/gpl-2.0.html GNU/GPL</license>