Skip to content

Commit

Permalink
version numbers
Browse files Browse the repository at this point in the history
  • Loading branch information
zero-24 committed Mar 21, 2016
1 parent e8ac62c commit a7209c5
Showing 1 changed file with 10 additions and 4 deletions.
14 changes: 10 additions & 4 deletions administrator/components/com_joomlaupdate/models/default.php
Expand Up @@ -789,12 +789,12 @@ public function cleanUp()
*
* @return void
*
* @since 3.5.0
* @since 3.5.1
*/
public function upload()
{
// Get the uploaded file information.
$input = JFactory::getApplication()->input;
$input = JFactory::getApplication()->input;

// Do not change the filter type 'raw'. We need this to let files containing PHP code to upload. See JInputFiles::get.
$userfile = $input->files->get('install_package', null, 'raw');
Expand Down Expand Up @@ -874,12 +874,14 @@ public function upload()
* @param array $credentials The credentials to authenticate the user with
*
* @return bool
*
* @since 3.5.1
*/
public function captiveLogin($credentials)
{
// Make sure the username matches
$username = isset($credentials['username']) ? $credentials['username'] : null;
$user = JFactory::getUser();
$user = JFactory::getUser();

if ($user->username != $username)
{
Expand All @@ -896,7 +898,7 @@ public function captiveLogin($credentials)
jimport('joomla.user.authentication');

$authenticate = JAuthentication::getInstance();
$response = $authenticate->authenticate($credentials);
$response = $authenticate->authenticate($credentials);

if ($response->status !== JAuthentication::STATUS_SUCCESS)
{
Expand All @@ -910,6 +912,8 @@ public function captiveLogin($credentials)
* Does the captive (temporary) file we uploaded before still exist?
*
* @return bool
*
* @since 3.5.1
*/
public function captiveFileExists()
{
Expand All @@ -929,6 +933,8 @@ public function captiveFileExists()
* Remove the captive (temporary) file we uploaded before and the .
*
* @return void
*
* @since 3.5.1
*/
public function removePackageFiles()
{
Expand Down

0 comments on commit a7209c5

Please sign in to comment.