Matthias Mullie has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/54870


Change subject: Fix issues discovered after dewiki deployment
......................................................................

Fix issues discovered after dewiki deployment

* "Sort by" dropdown would always display "Relevant" because in the value it 
was attempting to set, ASC/DESC is uppercase & the dropdown's values were 
lowercase
* The "discuss on talk page" template text contains a blockquote, whose tags 
were incorrectly being htmlentities'ed

Change-Id: I2793e87886c9aab8f3971e390962d24adfbaade8
---
M ArticleFeedbackv5.render.php
M SpecialArticleFeedbackv5.php
2 files changed, 5 insertions(+), 5 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5 
refs/changes/70/54870/1

diff --git a/ArticleFeedbackv5.render.php b/ArticleFeedbackv5.render.php
index 9589e25..556eb6e 100644
--- a/ArticleFeedbackv5.render.php
+++ b/ArticleFeedbackv5.render.php
@@ -870,10 +870,10 @@
                                                        
SpecialPage::getTitleFor( 'ArticleFeedbackv5', "$title/$record->aft_id" ),
                                                        $wgLang->date( 
$record->aft_timestamp ),
                                                        $wgLang->time( 
$record->aft_timestamp ),
-                                                       
SpecialPage::getTitleFor( 'ArticleFeedbackv5', $title ),
-                                                       Html::rawElement( 
'blockquote', array(), $record->aft_comment ),
-                                                       
$record->getArticle()->getTitle()
+                                                       
SpecialPage::getTitleFor( 'ArticleFeedbackv5', $title )
                                                )
+                                               ->rawParams( Html::rawElement( 
'blockquote', array(), $record->aft_comment ) )
+                                               ->params( 
$record->getArticle()->getTitle() )
                                                ->escaped();
 
                                        $sectionAnchor = '';
diff --git a/SpecialArticleFeedbackv5.php b/SpecialArticleFeedbackv5.php
index ae7b9fb..317ab3e 100644
--- a/SpecialArticleFeedbackv5.php
+++ b/SpecialArticleFeedbackv5.php
@@ -124,9 +124,9 @@
                                $this->filters[] = $filter;
                        }
                }
-               $this->sorts = array( 'relevance-desc', 'relevance-asc', 
'age-desc', 'age-asc' );
+               $this->sorts = array( 'relevance-DESC', 'relevance-ASC', 
'age-DESC', 'age-ASC' );
                if ( $this->isAllowed( 'aft-editor' ) ) {
-                       array_push( $this->sorts, 'helpful-desc', 'helpful-asc' 
);
+                       array_push( $this->sorts, 'helpful-DESC', 'helpful-ASC' 
);
                }
 
                // don't display archived list unless specifically "enabled" 
(if cronjob

-- 
To view, visit https://gerrit.wikimedia.org/r/54870
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2793e87886c9aab8f3971e390962d24adfbaade8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <mmul...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to