Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 2 contributors
Commits on May 05, 2012
@Militis Militis Optimize default group logic for registeration. 46673ce
Commits on May 06, 2012
@benedmunds Merge pull request #219 from Militis/2
Optimize default group logic for registration.
bc6c7b2
Showing with 2 additions and 3 deletions.
  1. +2 −3 models/ion_auth_model.php
View
5 models/ion_auth_model.php
@@ -185,7 +185,6 @@ public function __construct()
{
$rand = rand($this->min_rounds,$this->max_rounds);
$rounds = array('rounds' => $rand);
-
}
else
{
@@ -696,7 +695,7 @@ public function forgotten_password_complete($code, $salt=FALSE)
return FALSE;
}
}
-
+
$password = $this->salt();
$data = array(
@@ -793,7 +792,7 @@ public function register($username, $password, $email, $additional_data = array(
//add to default group if not already set
$default_group = $this->where('name', $this->config->item('default_group', 'ion_auth'))->group()->row();
- if (isset($default_group->id) && isset($groups) && !empty($groups) && !in_array($default_group->id, $groups) || !isset($groups) || empty($groups))
+ if ((isset($default_group->id) && !isset($groups)) || (empty($groups) && !in_array($default_group->id, $groups)))
{
$this->add_to_group($default_group->id, $id);
}

No commit comments for this range

Something went wrong with that request. Please try again.