Fix fatal error when loading non-existent news

carlbennett · carlbennett · commit 16a723e5f280 · 2016-04-06T04:12:10.000Z
diff --git a/controllers/News/View.php b/controllers/News/View.php
@@ -65,7 +65,8 @@ protected function getNewsPost(NewsViewModel &$model) {
     }
 
     // Don't show unpublished news posts to non-staff
-    if (!($model->news_post->getOptionsBitmask() & NewsPost::OPTION_PUBLISHED)
+    if ($model->news_post
+      && !($model->news_post->getOptionsBitmask() & NewsPost::OPTION_PUBLISHED)
       && !$model->acl_allowed) $model->news_post = null;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ protected function getNewsPost(NewsViewModel &$model) {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`// Don't show unpublished news posts to non-staff`
`68`		`- if (!($model->news_post->getOptionsBitmask() & NewsPost::OPTION_PUBLISHED)`
	`68`	`+ if ($model->news_post`
	`69`	`+ && !($model->news_post->getOptionsBitmask() & NewsPost::OPTION_PUBLISHED)`
`69`	`70`	`&& !$model->acl_allowed) $model->news_post = null;`
`70`	`71`	`}`
`71`	`72`