[MediaWiki-commits] [Gerrit] mediawiki...DiscussionThreading[master]: Fix invalid parameter passed to Linker::link()

[Reedy (Code Review)]

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/348062 )

Change subject: Fix invalid parameter passed to Linker::link()
......................................................................

Fix invalid parameter passed to Linker::link()

Fix incorrect elseif -> else if in JS

Fixup some whitespace

Noticed/Fixes suggested by PeterBodifee

Bug: T162264
Change-Id: I7168e213904f6bffcd2bcbb7d1e0f3cd16fe48bd
---
M DiscussionThreading.class.php
1 file changed, 23 insertions(+), 24 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DiscussionThreading 
refs/changes/62/348062/1

diff --git a/DiscussionThreading.class.php b/DiscussionThreading.class.php
index 86e495a..a81b7e7 100644
--- a/DiscussionThreading.class.php
+++ b/DiscussionThreading.class.php
@@ -1,11 +1,5 @@
 <?php
 
-/**
- * Created by PhpStorm.
- * User: reedy
- * Date: 26/11/2016
- * Time: 19:01
- */
 class DiscussionThreading {
        /**
         * @param $callobj
@@ -22,7 +16,9 @@
                        $spanClose="</span>";
                        $strippedResults = substr( substr( $result, strlen( 
$spanOpen ) ) , 0 , -strlen( $spanClose ) );
                        $commenturl = '&section='.$section.'&replyto=yes';
-                       $hint = ( $hint=='' ) ? '' : array( 'title' => 
wfMessage( 'discussionthreading-replysectionhint', $hint )->escaped() );
+                       $hint = ( $hint == '' )
+                               ? ''
+                               : array( 'title' => wfMessage( 
'discussionthreading-replysectionhint', $hint )->escaped() );
                        $curl = Linker::link(
                                $nt,
                                wfMessage( 'discussionthreading-replysection' 
)->escaped(),
@@ -31,7 +27,9 @@
                                array( 'known' )
                        );
                        $newthreadurl = '&section=new';
-                       $hint = ( $hint=='' ) ? '' : ' title="' . wfMessage( 
'discussionthreading-threadnewsectionhint', $hint )->escaped() . '"';
+                       $hint = ( $hint == '' )
+                               ? ''
+                               : array( 'title' => wfMessage( 
'discussionthreading-threadnewsectionhint', $hint )->escaped() );
                        $nurl = Linker::link(
                                $nt,
                                wfMessage( 
'discussionthreading-threadnewsection' )->escaped(),
@@ -99,22 +97,23 @@
                                // Insert javascript hook that will select the 
replace me text
                                global $wgOut;
                                $wgOut->addScript("<script 
type=\"text/javascript\">
-                        function efDiscussionThread(){
-                          var ctrl = document.editform.wpTextbox1;
-                          if (ctrl.setSelectionRange) {
-                                ctrl.focus();
-                                var end = ctrl.value.length;
-                                
ctrl.setSelectionRange(end-".strlen($replaceMeText).",end-1);
-                                ctrl.scrollTop = ctrl.scrollHeight;
-                          } elseif (ctrl.createTextRange) {
-                                var range = ctrl.createTextRange();
-                                range.collapse(false);
-                                range.moveStart('character', 
-".strlen($replaceMeText).");
-                                range.select();
-                          }
-                        }
-                        addOnloadHook(efDiscussionThread);
-                        </script>");
+function efDiscussionThread(){
+       var ctrl = document.editform.wpTextbox1;
+       if (ctrl.setSelectionRange) {
+               ctrl.focus();
+               var end = ctrl.value.length;
+               ctrl.setSelectionRange(end-".strlen($replaceMeText).",end-1);
+               ctrl.scrollTop = ctrl.scrollHeight;
+       } else if (ctrl.createTextRange) {
+               var range = ctrl.createTextRange();
+               range.collapse(false);
+               range.moveStart('character', -".strlen($replaceMeText).");
+               range.select();
+       }
+}
+addOnloadHook(efDiscussionThread);
+                       </script>"
+                               );
                                $efform->replyadded = true;
                                $efform->textbox1 = $text;
                        }

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I7168e213904f6bffcd2bcbb7d1e0f3cd16fe48bd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DiscussionThreading
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>

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