Skip to content

Commit bae1d43

Browse files
committed
Prepare 3.6.4 Stable Release
1 parent 0e2cd37 commit bae1d43

File tree

3 files changed

+5
-86
lines changed

3 files changed

+5
-86
lines changed

administrator/manifests/files/joomla.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<authorUrl>www.joomla.org</authorUrl>
77
<copyright>(C) 2005 - 2016 Open Source Matters. All rights reserved</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
9-
<version>3.6.4-dev</version>
9+
<version>3.6.4</version>
1010
<creationDate>October 2016</creationDate>
1111
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
1212

components/com_users/controllers/user.php

Lines changed: 0 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -283,87 +283,6 @@ public function menulogout()
283283
$this->setRedirect('index.php?option=com_users&task=user.logout&' . JSession::getFormToken() . '=1&return=' . base64_encode($url));
284284
}
285285

286-
/**
287-
* Method to register a user.
288-
*
289-
* @return boolean
290-
*
291-
* @since 1.6
292-
*/
293-
public function register()
294-
{
295-
JSession::checkToken('post') or jexit(JText::_('JINVALID_TOKEN'));
296-
297-
// Get the application
298-
$app = JFactory::getApplication();
299-
300-
// Get the form data.
301-
$data = $this->input->post->get('user', array(), 'array');
302-
303-
// Get the model and validate the data.
304-
$model = $this->getModel('Registration', 'UsersModel');
305-
306-
$form = $model->getForm();
307-
308-
if (!$form)
309-
{
310-
JError::raiseError(500, $model->getError());
311-
312-
return false;
313-
}
314-
315-
$return = $model->validate($form, $data);
316-
317-
// Check for errors.
318-
if ($return === false)
319-
{
320-
// Get the validation messages.
321-
$errors = $model->getErrors();
322-
323-
// Push up to three validation messages out to the user.
324-
for ($i = 0, $n = count($errors); $i < $n && $i < 3; $i++)
325-
{
326-
if ($errors[$i] instanceof Exception)
327-
{
328-
$app->enqueueMessage($errors[$i]->getMessage(), 'notice');
329-
330-
continue;
331-
}
332-
333-
$app->enqueueMessage($errors[$i], 'notice');
334-
}
335-
336-
// Save the data in the session.
337-
$app->setUserState('users.registration.form.data', $data);
338-
339-
// Redirect back to the registration form.
340-
$this->setRedirect('index.php?option=com_users&view=registration');
341-
342-
return false;
343-
}
344-
345-
// Finish the registration.
346-
$return = $model->register($data);
347-
348-
// Check for errors.
349-
if ($return === false)
350-
{
351-
// Save the data in the session.
352-
$app->setUserState('users.registration.form.data', $data);
353-
354-
// Redirect back to the registration form.
355-
$message = JText::sprintf('COM_USERS_REGISTRATION_SAVE_FAILED', $model->getError());
356-
$this->setRedirect('index.php?option=com_users&view=registration', $message, 'error');
357-
358-
return false;
359-
}
360-
361-
// Flush the data from the session.
362-
$app->setUserState('users.registration.form.data', null);
363-
364-
return true;
365-
}
366-
367286
/**
368287
* Method to login a user.
369288
*

libraries/cms/version/version.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ final class JVersion
3838
* @var string
3939
* @since 3.5
4040
*/
41-
const DEV_LEVEL = '4-dev';
41+
const DEV_LEVEL = '4';
4242

4343
/**
4444
* Development status.
4545
*
4646
* @var string
4747
* @since 3.5
4848
*/
49-
const DEV_STATUS = 'Development';
49+
const DEV_STATUS = 'Stable';
5050

5151
/**
5252
* Build number.
@@ -70,15 +70,15 @@ final class JVersion
7070
* @var string
7171
* @since 3.5
7272
*/
73-
const RELDATE = '18-October-2016';
73+
const RELDATE = '21-October-2016';
7474

7575
/**
7676
* Release time.
7777
*
7878
* @var string
7979
* @since 3.5
8080
*/
81-
const RELTIME = '16:37';
81+
const RELTIME = '16:33';
8282

8383
/**
8484
* Release timezone.

0 commit comments

Comments
 (0)