Merge branch '2.0'

javascript/BrokenExternalLinksReport.js

@@ -53,6 +53,7 @@
 
         // set button to "submitting" state
         $button.addClass('btn--loading loading');
+        $button.attr('disabled', true);
 
         if ($button.is('button')) {
           $button.append($(
@@ -75,6 +76,7 @@
         var $button = this.getButton();
 
         $button.removeClass('btn--loading loading');
+        $button.attr('disabled', false);
         $button.find('.btn__loading-icon').remove();
         $button.css('width', 'auto');
       },
@@ -89,7 +91,7 @@
           success: function(data) {
             // No report, so let user create one
             if (!data) {
-              this.buttonReset();
+              self.buttonReset();
               return;
             }
 

src/Controllers/CMSExternalLinksController.php

@@ -36,7 +36,7 @@ class CMSExternalLinksController extends Controller
         // Format status
         $track = BrokenExternalPageTrackStatus::get_latest();
         if ($track) {
-            return Convert::array2json([
+            return json_encode([
                 'TrackID' => $track->ID,
                 'Status' => $track->Status,
                 'Completed' => $track->getCompletedPages(),