Commit 220b51d8 authored by mmn's avatar mmn

Merge commit 'refs/merge-requests/199' of...

Merge commit 'refs/merge-requests/199' of git://gitorious.org/statusnet/mainline into statusnet-merge-requests/199
parents 710b7f61 9f91cc01
......@@ -398,7 +398,7 @@ class QnAPlugin extends MicroAppPlugin
$user = common_current_user();
$question = QnA_Question::getByNotice($notice);
if (!empty($user)) {
if (!empty($user) and !empty($question)) {
$profile = $user->getProfile();
$answer = $question->getAnswer($profile);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment