chenx221/yii2-netdisk
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Revert "Merge pull request #548 from cebe/action-response"

Browse Source 
This reverts commit 9d7597d61a51ae7030b667f740c2a97471cf7f6e, reversing
changes made to 6b6390f72b6a6010cfbe614aab236a90d10b1a00.
This commit is contained in:
Qiang Xue 2013-06-16 19:45:58 -04:00
parent 452bd8e5e3
commit 37b579fad6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
controllers/SiteController.php
View File

@ -27,7 +27,7 @@ class SiteController extends Controller
{ {
$model = new LoginForm(); $model = new LoginForm();
if ($this->populate($_POST, $model) && $model->login()) { if ($this->populate($_POST, $model) && $model->login()) {
return $this->response->redirect(array('site/index')); return Yii::$app->response->redirect(array('site/index'));
} else { } else {
return $this->render('login', array( return $this->render('login', array(
'model' => $model, 'model' => $model,
@ -38,7 +38,7 @@ class SiteController extends Controller
public function actionLogout() public function actionLogout()
{ {
Yii::$app->user->logout(); Yii::$app->user->logout();
return $this->response->redirect(array('site/index')); return Yii::$app->response->redirect(array('site/index'));
} }
public function actionContact() public function actionContact()
@ -46,7 +46,7 @@ class SiteController extends Controller
$model = new ContactForm; $model = new ContactForm;
if ($this->populate($_POST, $model) && $model->contact(Yii::$app->params['adminEmail'])) { if ($this->populate($_POST, $model) && $model->contact(Yii::$app->params['adminEmail'])) {
Yii::$app->session->setFlash('contactFormSubmitted'); Yii::$app->session->setFlash('contactFormSubmitted');
return $this->response->refresh(); return Yii::$app->response->refresh();
} else { } else {
return $this->render('contact', array( return $this->render('contact', array(
'model' => $model, 'model' => $model,