Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
This commit is contained in:
commit
d09995561d
@ -313,7 +313,7 @@ class QnAPlugin extends MicroAppPlugin
|
|||||||
|
|
||||||
$cls = array('hentry', 'notice', 'answer');
|
$cls = array('hentry', 'notice', 'answer');
|
||||||
|
|
||||||
$answer = QnA_Answer::staticGet('uri', $notice->uri);
|
$answer = QnA_Answer::staticGet('uri', $nli->notice->uri);
|
||||||
|
|
||||||
if (!empty($answer) && !empty($answer->best)) {
|
if (!empty($answer) && !empty($answer->best)) {
|
||||||
$cls[] = 'best';
|
$cls[] = 'best';
|
||||||
|
@ -88,7 +88,6 @@ class QnanewquestionAction extends Action
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->title = $this->trimmed('title');
|
$this->title = $this->trimmed('title');
|
||||||
common_debug("TITLE = " . $this->title);
|
|
||||||
$this->description = $this->trimmed('description');
|
$this->description = $this->trimmed('description');
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
Reference in New Issue
Block a user