jenkins-bot has submitted this change and it was merged.

Change subject: Remove flickrApiUrl from $wgUploadWizardConfig
......................................................................


Remove flickrApiUrl from $wgUploadWizardConfig

The current value was breaking if browsing the site from http
(It always needs to be https per flickr policy). This was fixed
in the extension. Since value should be the same, simply stop
overriding the UploadWizard extension.

Also remove comment which was beside the line, but seems unrelated.

Bug: 67298
Change-Id: I91960a444491dee91691f8697371c293ed7838a5
---
M wmf-config/CommonSettings.php
1 file changed, 0 insertions(+), 2 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 31efc58..870b0f1 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1750,8 +1750,6 @@
                                'Uploaded with UploadWizard',
                        ),
                ),
-               // If Special:UploadWizard again experiences unexplained 
slowness loading JavaScript (spinner on intial load spinning forever)
-               'flickrApiUrl' => '//api.flickr.com/services/rest/?',
                // Normally we don't include API keys in CommonSettings, but 
this key
                // isn't private since it's used on the client-side, i.e. 
anyone can see
                // it in the outgoing AJAX requests to Flickr.

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I91960a444491dee91691f8697371c293ed7838a5
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff <[email protected]>
Gerrit-Reviewer: GergÅ‘ Tisza <[email protected]>
Gerrit-Reviewer: Gilles <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to