@@ -95,7 +95,7 @@ else $call = false; - if (method_exists($this->controller, $method)) + if ($call === false and method_exists($this->controller, $method)) $response = call_user_func_array(array($this->controller, $method), $args); else $response = false; includes/class/Route.php @@ -40,7 +40,7 @@ $args = func_get_args(); $args[0] = $call; if ($index + 1 == count($name)) - return $return = $this->exists($call) ? call_user_func_array(array($this, "call"), $args) : $return ; + return $return == $this->exists($call) ? call_user_func_array(array($this, "call"), $args) : $return ; else $return = $this->exists($call) ? call_user_func_array(array($this, "call"), $args) : $return ; } includes/class/Trigger.php @@ -479,7 +479,9 @@ Flash::warning(__("Invalid e-mail address.")); if (!Flash::exists("warning")) { - User::add($_POST['login'], $_POST['password1'], $_POST['email']); + $user = User::add($_POST['login'], $_POST['password1'], $_POST['email']); + + Trigger::current()->call("user_registered", $user); $_SESSION['login'] = $_POST['login']; $_SESSION['password'] = md5($_POST['password1']); includes/controller/Main.php 2ff3d3bcccd006579e6ad18d584f726ec20f3099 Alex Suraci i.am@toogeneric.com http://github.com/vito/chyrp/commit/7e8768b454fb3d5cf8cda1813524c80002b3584c 7e8768b454fb3d5cf8cda1813524c80002b3584c 2008-11-18T12:41:57-08:00 2008-11-18T12:41:57-08:00 * If a Route call is successful, the original Controller method will be ignored. * Fixed a rogue = instead of == in Trigger.php. * Added a "user_registered" trigger that passes the new user as the arg. 761bf8b8d0a8a059522fd50ee294971ef477e071 Alex Suraci i.am@toogeneric.com