Merge pull request #2 from zero-24/patch-8

let travis be a happy guy
lcdservices · Sep 18, 2015 · 6200c59 · 6200c59
2 parents 2b5f4c8 + 15b3ae3
commit 6200c59
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/components/com_users/models/registration.php b/components/com_users/models/registration.php
@@ -83,14 +83,14 @@ public function activate($token)
 			$data['siteurl'] = JUri::base();
 			$base = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
 			$data['activate'] = $base . JRoute::_('index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false);
-			
+
 			// Remove administrator/ from activate url in case this method is called from admin
 			if (JFactory::getApplication()->isAdmin())
 			{
-				$adminPos = strrpos($data['activate'], 'administrator/');
+				$adminPos         = strrpos($data['activate'], 'administrator/');
 				$data['activate'] = substr_replace($data['activate'], '', $adminPos, 14);
 			}
-			
+
 			$data['fromname'] = $config->get('fromname');
 			$data['mailfrom'] = $config->get('mailfrom');
 			$data['sitename'] = $config->get('sitename');
@@ -416,11 +416,11 @@ public function register($temp)
 			$uri = JUri::getInstance();
 			$base = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
 			$data['activate'] = $base . JRoute::_('index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false);
-			
+
 			// Remove administrator/ from activate url in case this method is called from admin
 			if (JFactory::getApplication()->isAdmin())
 			{
-				$adminPos = strrpos($data['activate'], 'administrator/');
+				$adminPos         = strrpos($data['activate'], 'administrator/');
 				$data['activate'] = substr_replace($data['activate'], '', $adminPos, 14);
 			}
 
@@ -460,11 +460,11 @@ public function register($temp)
 			$uri = JUri::getInstance();
 			$base = $uri->toString(array('scheme', 'user', 'pass', 'host', 'port'));
 			$data['activate'] = $base . JRoute::_('index.php?option=com_users&task=registration.activate&token=' . $data['activation'], false);
-			
+
 			// Remove administrator/ from activate url in case this method is called from admin
 			if (JFactory::getApplication()->isAdmin())
 			{
-				$adminPos = strrpos($data['activate'], 'administrator/');
+				$adminPos         = strrpos($data['activate'], 'administrator/');
 				$data['activate'] = substr_replace($data['activate'], '', $adminPos, 14);
 			}