Merge branch 'master' of github.com:yiisoft/yii2

920098c0 · Qiang Xue · 249f90f5 · 2f051e9d · 920098c0
Commit 920098c0 authored May 28, 2013 by Qiang Xue
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ActionFilter.php framework/yii/base/ActionFilter.php +2 -2

No files found.
--- a/framework/yii/base/ActionFilter.php
+++ b/framework/yii/base/ActionFilter.php
@@ -30,8 +30,8 @@ class ActionFilter extends Behavior
 	public function events()
 	{
 		return array(
-			'beforeAction' => 'beforeFilter',
-			'afterAction' => 'afterFilter',
+			Controller::EVENT_BEFORE_ACTION => 'beforeFilter',
+			Controller::EVENT_AFTER_ACTION => 'afterFilter',
 		);
 	}