fix conflicts

.gitignore

@@ -64,6 +64,8 @@ Desktop.ini
 /libraries/vendor/ircmaxell/password-compat/phpunit.xml.dist
 /libraries/vendor/ircmaxell/password-compat/README.md
 /libraries/vendor/ircmaxell/password-compat/version-test.php
+/libraries/vendor/joomla/*/.gitignore
+/libraries/vendor/joomla/*/.gitmodules
 /libraries/vendor/joomla/*/docs
 /libraries/vendor/joomla/*/Tests
 /libraries/vendor/joomla/*/vendor
@@ -90,6 +92,9 @@ Desktop.ini
 /libraries/vendor/paragonie/random_compat/.gitignore
 /libraries/vendor/paragonie/random_compat/.scrutinizer.yml
 /libraries/vendor/paragonie/random_compat/.travis.yml
+/libraries/vendor/paragonie/random_compat/dist
+/libraries/vendor/paragonie/random_compat/other
+/libraries/vendor/paragonie/random_compat/CHANGELOG.md
 /libraries/vendor/paragonie/random_compat/ERRATA.md
 /libraries/vendor/paragonie/random_compat/README.md
 /libraries/vendor/paragonie/random_compat/SECURITY.md

.travis.yml

@@ -22,6 +22,10 @@ matrix:
       env: RUN_PHPCS="yes" INSTALL_APCU="yes"
     - php: 7.0
       env: INSTALL_APCU="yes" INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled apcu_bc install until https://github.com/travis-ci/travis-ci/issues/5207 is resolved
+    - php: hhvm
+      env: INSTALL_APCU_BC_BETA="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no" INSTALL_REDIS="no" # Disabled items that currently do not work in travis-ci hhvm
+  allow_failures:
+    - php: hhvm
 
 services:
   - memcache

README.md

@@ -79,7 +79,7 @@ Do you want to improve Joomla?
 --------------------
 * How do you [request a feature](https://docs.joomla.org/How_do_you_request_a_feature%3F)?
 * How do you [report a bug](https://docs.joomla.org/Filing_bugs_and_issues)?
-* Get Involved: Joomla! is community developed software. [Join the community](http://volunteers.joomla.org/).
+* Get Involved: Joomla! is community developed software. [Join the community](https://volunteers.joomla.org/).
 * Documentation for [Developers](https://docs.joomla.org/Developers).
 * Documentation for [Web designers](https://docs.joomla.org/Web_designers).
 

README.txt

@@ -60,7 +60,7 @@
 12- Do you want to improve Joomla?
 	* How do you request a feature? https://docs.joomla.org/How_do_you_request_a_feature%3F
 	* How do you report a bug? https://docs.joomla.org/Filing_bugs_and_issues
-	* Get Involved: Joomla! is a community developed software. Join the community at http://volunteers.joomla.org/
+	* Get Involved: Joomla! is a community developed software. Join the community at https://volunteers.joomla.org/
 	* Are you a Developer? https://docs.joomla.org/Developers
 	* Are you a Web designer? https://docs.joomla.org/Web_designers
 

administrator/components/com_admin/models/sysinfo.php

@@ -72,6 +72,7 @@ class AdminModelSysInfo extends JModelLegacy
 			'Cookie',
 			'DOCUMENT_ROOT',
 			'extension_dir',
+			'error_log',
 			'Host',
 			'HTTP_COOKIE',
 			'HTTP_HOST',
@@ -99,7 +100,9 @@ class AdminModelSysInfo extends JModelLegacy
 			'Server Root',
 			'session.name',
 			'session.save_path',
+			'upload_tmp_dir',
 			'User/Group',
+			'open_basedir'
 		),
 		'other' => array(
 			'db',
@@ -122,7 +125,8 @@ class AdminModelSysInfo extends JModelLegacy
 			'session_memcached_server_host',
 			'sitename',
 			'smtphost',
-			'tmp_path'
+			'tmp_path',
+			'open_basedir'
 		)
 	);
 
@@ -201,6 +205,10 @@ protected function cleanSectionPrivateData($sectionValues)
 	{
 		if (!is_array($sectionValues))
 		{
+			if (strstr($sectionValues, JPATH_ROOT))
+			{
+				$sectionValues = 'xxxxxx';
+			}
 			return strlen($sectionValues) ? 'xxxxxx' : '';
 		}
 
@@ -243,6 +251,7 @@ public function &getPhpSettings()
 			'zip'                => function_exists('zip_open') && function_exists('zip_read'),
 			'mbstring'           => extension_loaded('mbstring'),
 			'iconv'              => function_exists('iconv'),
+			'mcrypt'             => extension_loaded('mcrypt'),
 			'max_input_vars'     => ini_get('max_input_vars'),
 		);
 
@@ -325,12 +334,13 @@ public function phpinfoEnabled()
 	 * Method to get filter data from the model
 	 *
 	 * @param   string  $dataType  Type of data to get safely
+	 * @param   bool    $public    If true no sensitive information will be removed
 	 *
 	 * @return  array
 	 *
 	 * @since   3.5
 	 */
-	public function getSafeData($dataType)
+	public function getSafeData($dataType, $public = true)
 	{
 		if (isset($this->safeData[$dataType]))
 		{
@@ -344,7 +354,7 @@ public function getSafeData($dataType)
 			return array();
 		}
 
-		$data = $this->$methodName();
+		$data = $this->$methodName($public);
 
 		$this->safeData[$dataType] = $this->cleanPrivateData($data, $dataType);
 
@@ -483,11 +493,13 @@ public function getExtensions()
 	/**
 	 * Method to get the directory states
 	 *
+	 * @param   bool  $public  If true no information is going to be removed
+	 *
 	 * @return  array States of directories
 	 *
 	 * @since   1.6
 	 */
-	public function getDirectory()
+	public function getDirectory($public = false)
 	{
 		if (!empty($this->directories))
 		{
@@ -596,8 +608,16 @@ public function getDirectory()
 			$this->addDirectory('administrator/cache', JPATH_CACHE, 'COM_ADMIN_CACHE_DIRECTORY');
 		}
 
-		$this->addDirectory($registry->get('log_path', JPATH_ROOT . '/log'), $registry->get('log_path', JPATH_ROOT . '/log'), 'COM_ADMIN_LOG_DIRECTORY');
-		$this->addDirectory($registry->get('tmp_path', JPATH_ROOT . '/tmp'), $registry->get('tmp_path', JPATH_ROOT . '/tmp'), 'COM_ADMIN_TEMP_DIRECTORY');
+		if ($public)
+		{
+			$this->addDirectory('log', $registry->get('log_path', JPATH_ROOT . '/log'), '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('tmp_path', JPATH_ROOT . '/tmp'), $registry->get('tmp_path', JPATH_ROOT . '/tmp'), 'COM_ADMIN_TEMP_DIRECTORY');
+		}
 
 		return $this->directories;
 	}