Prepare 3.6.4 Stable Release

joomla · Oct 25, 2016 · bae1d43 · bae1d43
1 parent 0e2cd37
commit bae1d43
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 86 deletions.
diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml
@@ -6,7 +6,7 @@
 	<authorUrl>www.joomla.org</authorUrl>
 	<copyright>(C) 2005 - 2016 Open Source Matters. All rights reserved</copyright>
 	<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
-	<version>3.6.4-dev</version>
+	<version>3.6.4</version>
 	<creationDate>October 2016</creationDate>
 	<description>FILES_JOOMLA_XML_DESCRIPTION</description>
 

diff --git a/components/com_users/controllers/user.php b/components/com_users/controllers/user.php
@@ -283,87 +283,6 @@ public function menulogout()
 		$this->setRedirect('index.php?option=com_users&task=user.logout&' . JSession::getFormToken() . '=1&return=' . base64_encode($url));
 	}
 
-	/**
-	 * Method to register a user.
-	 *
-	 * @return  boolean
-	 *
-	 * @since   1.6
-	 */
-	public function register()
-	{
-		JSession::checkToken('post') or jexit(JText::_('JINVALID_TOKEN'));
-
-		// Get the application
-		$app = JFactory::getApplication();
-
-		// Get the form data.
-		$data = $this->input->post->get('user', array(), 'array');
-
-		// Get the model and validate the data.
-		$model  = $this->getModel('Registration', 'UsersModel');
-
-		$form = $model->getForm();
-
-		if (!$form)
-		{
-			JError::raiseError(500, $model->getError());
-
-			return false;
-		}
-
-		$return = $model->validate($form, $data);
-
-		// Check for errors.
-		if ($return === false)
-		{
-			// Get the validation messages.
-			$errors = $model->getErrors();
-
-			// Push up to three validation messages out to the user.
-			for ($i = 0, $n = count($errors); $i < $n && $i < 3; $i++)
-			{
-				if ($errors[$i] instanceof Exception)
-				{
-					$app->enqueueMessage($errors[$i]->getMessage(), 'notice');
-
-					continue;
-				}
-
-				$app->enqueueMessage($errors[$i], 'notice');
-			}
-
-			// Save the data in the session.
-			$app->setUserState('users.registration.form.data', $data);
-
-			// Redirect back to the registration form.
-			$this->setRedirect('index.php?option=com_users&view=registration');
-
-			return false;
-		}
-
-		// Finish the registration.
-		$return = $model->register($data);
-
-		// Check for errors.
-		if ($return === false)
-		{
-			// Save the data in the session.
-			$app->setUserState('users.registration.form.data', $data);
-
-			// Redirect back to the registration form.
-			$message = JText::sprintf('COM_USERS_REGISTRATION_SAVE_FAILED', $model->getError());
-			$this->setRedirect('index.php?option=com_users&view=registration', $message, 'error');
-
-			return false;
-		}
-
-		// Flush the data from the session.
-		$app->setUserState('users.registration.form.data', null);
-
-		return true;
-	}
-
 	/**
 	 * Method to login a user.
 	 *

diff --git a/libraries/cms/version/version.php b/libraries/cms/version/version.php
@@ -38,15 +38,15 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_LEVEL = '4-dev';
+	const DEV_LEVEL = '4';
 
 	/**
 	 * Development status.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const DEV_STATUS = 'Development';
+	const DEV_STATUS = 'Stable';
 
 	/**
 	 * Build number.
@@ -70,15 +70,15 @@ final class JVersion
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELDATE = '18-October-2016';
+	const RELDATE = '21-October-2016';
 
 	/**
 	 * Release time.
 	 *
 	 * @var    string
 	 * @since  3.5
 	 */
-	const RELTIME = '16:37';
+	const RELTIME = '16:33';
 
 	/**
 	 * Release timezone.