From 1d687e23f35342c0d83325d17c90d547a8d1a0d4 Mon Sep 17 00:00:00 2001
From: Arlo Breault <abreault@wikimedia.org>
Date: Wed, 22 Aug 2018 18:27:23 -0400
Subject: [PATCH] Use the dir parameter only from the full definition of a
 named ref tag

Bug: T196827
Change-Id: Iaf84966e37cea730c9eca07c19a555971ffeadf3
---
 includes/Cite.php                |  2 ++
 tests/parser/citeParserTests.txt | 38 ++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+)

diff --git a/includes/Cite.php b/includes/Cite.php
index b3ec861b5..1cef1d769 100644
--- a/includes/Cite.php
+++ b/includes/Cite.php
@@ -545,6 +545,8 @@ class Cite {
 		if ( $this->mRefs[$group][$key]['text'] === null && $str !== '' ) {
 			// If no text found before, use this text
 			$this->mRefs[$group][$key]['text'] = $str;
+			// Use the dir parameter only from the full definition of a named ref tag
+			$this->mRefs[$group][$key]['dir'] = $dir;
 			$this->mRefCallStack[] = [ 'assign', $call, $str, $key, $group,
 				$this->mRefs[$group][$key]['key'] ];
 		} else {
diff --git a/tests/parser/citeParserTests.txt b/tests/parser/citeParserTests.txt
index ac549c034..1b7b2d629 100644
--- a/tests/parser/citeParserTests.txt
+++ b/tests/parser/citeParserTests.txt
@@ -1578,3 +1578,41 @@ Ref with block content in formatting tag
 <p><i>hi<sup about="#mwt3" class="mw-ref" id="cite_ref-1" rel="dc:references" typeof="mw:Extension/ref" data-mw='{"name":"ref","attrs":{},"body":{"id":"mw-reference-text-cite_note-1"}}'><a href="./Main_Page#cite_note-1" style="counter-reset: mw-Ref 1;"><span class="mw-reflink-text">[1]</span></a></sup></i></p>
 <ol class="mw-references references" typeof="mw:Extension/references" about="#mwt4" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="./Main_Page#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text"><div data-parsoid='{"stx":"html"}'>ho</div></span></li></ol>
 !! end
+
+!! test
+T196827: Use the dir parameter only from the full definition of a named ref tag
+!! wikitext
+abc<ref name="r1" />def
+
+ghi<ref name="r1" dir="rtl">jkl</ref>mno
+
+<references />
+!! html/php
+<p>abc<sup id="cite_ref-r1_1-0" class="reference"><a href="#cite_note-r1-1">&#91;1&#93;</a></sup>def
+</p><p>ghi<sup id="cite_ref-r1_1-1" class="reference"><a href="#cite_note-r1-1">&#91;1&#93;</a></sup>mno
+</p>
+<div class="mw-references-wrap"><ol class="references">
+<li id="cite_note-r1-1" class="mw-cite-dir-rtl"><span class="mw-cite-backlink">↑ <sup><a href="#cite_ref-r1_1-0">1.0</a></sup> <sup><a href="#cite_ref-r1_1-1">1.1</a></sup></span> <span class="reference-text">jkl</span>
+</li>
+</ol></div>
+
+!! end
+
+!! test
+T196827: Ignore the dir parameter from the first use, which is not a full definition, and use the dir value from the full definition of a named ref tag
+!! wikitext
+abc<ref name="r1" dir="rtl" />def
+
+ghi<ref name="r1">jkl</ref>mno
+
+<references />
+!! html/php
+<p>abc<sup id="cite_ref-r1_1-0" class="reference"><a href="#cite_note-r1-1">&#91;1&#93;</a></sup>def
+</p><p>ghi<sup id="cite_ref-r1_1-1" class="reference"><a href="#cite_note-r1-1">&#91;1&#93;</a></sup>mno
+</p>
+<div class="mw-references-wrap"><ol class="references">
+<li id="cite_note-r1-1"><span class="mw-cite-backlink">↑ <sup><a href="#cite_ref-r1_1-0">1.0</a></sup> <sup><a href="#cite_ref-r1_1-1">1.1</a></sup></span> <span class="reference-text">jkl</span>
+</li>
+</ol></div>
+
+!! end