From e1c46107132b7df174f9c565f90cf3ed7743d8c1 Mon Sep 17 00:00:00 2001 From: Krivchikov Dmitry Date: Fri, 25 Sep 2015 17:27:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=B2=20?= =?UTF-8?q?=D0=B1=D0=BB=D0=BE=D0=B3=D0=B5=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA?= =?UTF-8?q?=D0=BE=20=D0=BE=D0=BF=D1=83=D0=B1=D0=BB=D0=B8=D0=BA=D0=BE=D0=B2?= =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D1=81=D1=82=D0=B0=D1=82=D0=B5?= =?UTF-8?q?=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ground/controllers/UserController.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ground/controllers/UserController.php b/ground/controllers/UserController.php index 3aa4ff9..c2434a2 100644 --- a/ground/controllers/UserController.php +++ b/ground/controllers/UserController.php @@ -33,8 +33,11 @@ class UserController extends Controller self::addStyle('/css/bootstrap-theme.min.css'); self::addStyle('http://cdnjs.cloudflare.com/ajax/libs/fotorama/4.6.3/fotorama.css'); - - $articles = Article::model()->getAll(array('where'=>'`author`='.(int)$user->id)); + if (App::$user && App::$user->id == $id) { + $articles = Article::model()->getAll(array('where'=>'`author`='.(int)$user->id)); + } else { + $articles = Article::model()->getAll(array('where'=>'`author`='.(int)$user->id . ' AND `status` = "published" ')); + } $randomPoint = Point::model()->getRandom(); $randomPoint->description = mb_substr($randomPoint->description, 0, 400, 'UTF-8'); @@ -43,6 +46,7 @@ class UserController extends Controller self::render('user/index.php', array( 'user' => $user, 'articles' => $articles, + 'imAuthor' => App::$user && App::$user->id == $id, 'randomPoint' => $randomPoint, )); }