Merge branch 'staging' of https://github.com/joomla/joomla-cms into s…

…taging
joomla · Apr 10, 2016 · c67ea1c · c67ea1c
2 parents 0690230 + b14bbd0
commit c67ea1c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -19,7 +19,7 @@ class JoomlaInstallerScript
 	/**
 	 * Method to update Joomla!
 	 *
-	 * @param   JInstallerFile  $installer  The class calling this method
+	 * @param   JInstallerAdapterFile  $installer  The class calling this method
 	 *
 	 * @return  void
 	 */
@@ -31,7 +31,6 @@ public function update($installer)
 		JLog::addLogger($options, JLog::INFO, array('Update', 'databasequery', 'jerror'));
 		JLog::add(JText::_('COM_JOOMLAUPDATE_UPDATE_LOG_DELETE_FILES'), JLog::INFO, 'Update');
 
-		$this->deleteUnexistingFiles();
 		$this->updateManifestCaches();
 		$this->updateDatabase();
 		$this->clearRadCache();

diff --git a/libraries/joomla/mail/mail.php b/libraries/joomla/mail/mail.php
@@ -51,6 +51,12 @@ public function __construct($exceptions = true)
 		{
 			JLog::add(sprintf('Error in JMail API: %s', $message), JLog::ERROR, 'mail');
 		};
+
+		// If debug mode is enabled then set SMTPDebug to the maximum level
+		if (defined('JDEBUG') && JDEBUG)
+		{
+			$this->SMTPDebug = 4;
+		}
 	}
 
 	/**

diff --git a/plugins/captcha/recaptcha/recaptchalib.php b/plugins/captcha/recaptcha/recaptchalib.php
@@ -51,7 +51,7 @@ class JReCaptcha
 	 *
 	 * @param string $secret shared secret between site and ReCAPTCHA server.
 	 */
-	function JReCaptcha($secret)
+	public function __construct($secret)
 	{
 		if ($secret == null || $secret == "")
 		{