Merge branch 'test' of git.oschina.net:yiguanjia/php into test

www/protected/modules/o2o/controllers/OrderController.php

@@ -505,13 +505,11 @@ class  OrderController extends O2oBaseController{
         }
 
         $criteria = new EMongoCriteria();
-
         $criteria->user('==',new MongoId($user_id));
         $current_time = time();
         $criteria->start_time('<=',$current_time);
         $criteria->end_time('>=',$current_time);
         $criteria->status('==',1);
-        
         $coupons = UserCoupon::model()->findAll($criteria);
 
         $coupon_list = array();