Changeset 628
- Timestamp:
- 07/05/08 12:06:23 (3 months ago)
- Files:
-
- 1 modified
-
trunk/app/controllers/users_controller.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/app/controllers/users_controller.php
r627 r628 366 366 { 367 367 $msg = "<h2>You have been registered!</h2> <p>A confirmation email has been sent to: ".$this->data['User']['email']; 368 $msg .= " In order to complete the registration process, please click on the link contained on the email.</p>";368 $msg .= " In order to complete the registration process, please click on the link contained on the email.</p>"; 369 369 $this->set('message', array("Suceess"=>$msg)); 370 370 $this->set('ok', true); … … 550 550 $conditions = null; //array("Entry.user_id"=>$this->Auth->user('id')); 551 551 552 if ($order == null)552 if ($order === null) 553 553 { 554 554 $order = "User.id"; 555 555 } 556 556 557 if ($group_id != null && intval($group_id) ) 558 { 557 if ($group_id != null && intval($group_id) ): 559 558 $conditions['User.group_id'] = $group_id; 560 } 559 endif; 560 561 561 $this->set('data', $this->User->findAll($conditions)); 562 562 }
