forked from GNUsocial/gnu-social
Merge branch '1.0.x' into testing
This commit is contained in:
commit
03ad3f69cc
@ -295,9 +295,13 @@ class QnAPlugin extends MicroAppPlugin
|
|||||||
{
|
{
|
||||||
case QnA_Question::OBJECT_TYPE:
|
case QnA_Question::OBJECT_TYPE:
|
||||||
$id = (empty($nli->repeat)) ? $nli->notice->id : $nli->repeat->id;
|
$id = (empty($nli->repeat)) ? $nli->notice->id : $nli->repeat->id;
|
||||||
|
$class = 'hentry notice question';
|
||||||
|
if ($nli->notice->scope != 0 && $nli->notice->scope != 1) {
|
||||||
|
$class .= ' limited-scope';
|
||||||
|
}
|
||||||
$nli->out->elementStart(
|
$nli->out->elementStart(
|
||||||
'li', array(
|
'li', array(
|
||||||
'class' => 'hentry notice question',
|
'class' => $class,
|
||||||
'id' => 'notice-' . $id
|
'id' => 'notice-' . $id
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
@ -309,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