GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '1.0.x' into testing

This commit is contained in:
Evan Prodromou 2011-04-05 13:47:49 -04:00
parent c9ca11eb64 d09995561d
commit 03ad3f69cc
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/QnA/QnAPlugin.php
View File

@ -295,9 +295,13 @@ class QnAPlugin extends MicroAppPlugin
{
case QnA_Question::OBJECT_TYPE:
$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(
'li', array(
'class' => 'hentry notice question',
'class' => $class,
'id' => 'notice-' . $id
)
);
@ -309,7 +313,7 @@ class QnAPlugin extends MicroAppPlugin
$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)) {
$cls[] = 'best';

1
plugins/QnA/actions/qnanewquestion.php
View File

@ -88,7 +88,6 @@ class QnanewquestionAction extends Action
}
$this->title = $this->trimmed('title');
common_debug("TITLE = " . $this->title);
$this->description = $this->trimmed('description');
return true;