Page MenuHomePhabricator
Files F8779

33513.patch
Public
Actions

Authored By
• bzimport
Nov 22 2014, 12:08 AM
Size
5 KB
Referenced Files
None
Subscribers
None

33513.patch
View Options

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 5547e4c..9fae442 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1887,8 +1887,6 @@ if ( $wmgUseUploadWizard ) {
'disableResourceLoader' => false,
'autoCategory' => 'Uploaded with UploadWizard',
// If Special:UploadWizard again experiences unexplained slowness loading JavaScript (spinner on intial load spinning forever)
- // set fallbackToAltUploadForm to true.
- 'altUploadForm' => 'Special:Upload', # Set by demon, 2011-05-10 per neilk
'flickrApiUrl' => 'http://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
@@ -1897,20 +1895,18 @@ if ( $wmgUseUploadWizard ) {
);
$wgUploadWizardConfig['enableChunked'] = 'opt-in';
+ $wgUploadWizardConfig['altUploadForm'] = $wmgAltUploadForm; // bug 33513
if ( $wgDBname == 'testwiki' ) {
$wgUploadWizardConfig['feedbackPage'] = 'Prototype_upload_wizard_feedback';
- $wgUploadWizardConfig['altUploadForm'] = 'Special:Upload';
$wgUploadWizardConfig["missingCategoriesWikiText"] = '<p><span class="errorbox"><b>Hey, no categories?</b></span></p>';
unset( $wgUploadWizardConfig['fallbackToAltUploadForm'] );
} elseif ( $wgDBname == 'commonswiki' ) {
$wgUploadWizardConfig['feedbackPage'] = 'Commons:Upload_Wizard_feedback'; # Set by neilk, 2011-11-01, per erik
- $wgUploadWizardConfig['altUploadForm'] = 'Commons:Upload';
$wgUploadWizardConfig["missingCategoriesWikiText"] = "{{subst:unc}}";
$wgUploadWizardConfig['blacklistIssuesPage'] = 'Commons:Upload_Wizard_blacklist_issues'; # Set by neilk, 2011-11-01, per erik
} elseif ( $wgDBname == 'test2wiki' ) {
$wgUploadWizardConfig['feedbackPage'] = 'Wikipedia:Upload_Wizard_feedback'; # Set by neilk, 2011-11-01, per erik
- $wgUploadWizardConfig['altUploadForm'] = 'Wikipedia:Upload';
$wgUploadWizardConfig["missingCategoriesWikiText"] = "{{subst:unc}}";
$wgUploadWizardConfig['blacklistIssuesPage'] = 'Wikipedia:Upload_Wizard_blacklist_issues'; # Set by neilk, 2011-11-01, per erik
}
diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php
index 9a79bd3..0c74b7c 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -10379,6 +10379,70 @@ $wgConf->settings = array(
'foundationwiki' => true,
),
+'wmgAltUploadForm' => array( // bug 33513
+ 'default' => 'Special:Upload',
+ 'test2wiki' => 'Wikipedia:Upload',
+
+ 'commonswiki' => array(
+ 'default' => 'Commons:Upload',
+ 'ast' => 'Commons:Upload/ast?uselang=ast',
+ 'be-tarask' => 'Commons:Upload/be-tarask?uselang=be-tarask',
+ 'bg' => 'Commons:Upload/bg?uselang=bg',
+ 'bn' => 'Commons:Upload/bn?uselang=bn',
+ 'ca' => 'Commons:Upload/ca?uselang=ca',
+ 'cs' => 'Commons:Upload/cs?uselang=cs',
+ 'da' => 'Commons:Upload/da?uselang=da',
+ 'de' => 'Commons:Hochladen?uselang=de',
+ 'el' => 'Commons:Upload/el?uselang=el',
+ 'en' => 'Commons:Upload?uselang=en',
+ 'eo' => 'Commons:Upload/eo?uselang=eo',
+ 'es' => 'Commons:Upload/es&uselang=es',
+ 'et' => 'Commons:Upload/et&uselang=et',
+ 'eu' => 'Commons:Upload/eu&uselang=eu',
+ 'ext' => 'Commons:Upload/ext&uselang=ext',
+ 'fa' => 'Commons:Upload/fa&uselang=fa',
+ 'fi' => 'Commons:Tallenna&uselang=fi',
+ 'fo' => 'Commons:Upload/fo&uselang=fo',
+ 'fr' => 'Commons:Téléverser?uselang=fr',
+ 'fy' => 'Commons:Upload/fy&uselang=fy',
+ 'gl' => 'Commons:Upload/gl&uselang=gl',
+ 'he' => 'Commons:Upload/he&uselang=he',
+ 'hr' => 'Commons:Upload/hr&uselang=hr',
+ 'hu' => 'Commons:Upload/hu&uselang=hu',
+ 'hy' => 'Commons:Upload/hy&uselang=hy',
+ 'is' => 'Commons:Upload/is&uselang=is',
+ 'it' => 'Commons:Upload/it&uselang=it',
+ 'ja' => 'Commons:Upload/ja&uselang=ja',
+ 'ka' => 'Commons:Upload/ka&uselang=ka',
+ 'km' => 'Commons:Upload/km&uselang=km',
+ 'ko' => 'Commons:Upload/ko&uselang=ko',
+ 'ksh' => 'Commons:Upload/ksh&uselang=ksh',
+ 'ln' => 'Commons:Upload/ln&uselang=ln',
+ 'lt' => 'Commons:Upload/lt&uselang=lt',
+ 'mk' => 'Commons:Upload/mk&uselang=mk',
+ 'ml' => 'Commons:Upload/ml&uselang=ml',
+ 'mr' => 'Commons:Upload/mr&uselang=mr',
+ 'nl' => 'Commons:Upload/nl&uselang=nl',
+ 'no' => 'Commons:Upload/no&uselang=no',
+ 'pl' => 'Commons:Upload/pl&uselang=pl',
+ 'pt' => 'Commons:Upload/pt&uselang=pt',
+ 'pt-br' => 'Commons:Upload/pt-br&uselang=pt-br',
+ 'ro' => 'Commons:Upload/ro&uselang=ro',
+ 'ru' => 'Commons:Upload/ru&uselang=ru',
+ 'sk' => 'Commons:Upload/sk&uselang=sk',
+ 'sl' => 'Commons:Upload/sl&uselang=sl',
+ 'sr' => 'Commons:Upload/sr&uselang=sr',
+ 'sv' => 'Commons:Upload/sv&uselang=sv',
+ 'th' => 'Commons:Upload/th&uselang=th',
+ 'tr' => 'Commons:Upload/tr&uselang=tr',
+ 'uk' => 'Commons:Upload/uk&uselang=uk',
+ 'vi' => 'Commons:Upload/vi&uselang=vi',
+ 'yue' => 'Commons:Upload/yue&uselang=yue',
+ 'zh' => 'Commons:Upload/zh-hans&uselang=zh',
+ 'zh-hant' => 'Commons:Upload/zh-hant&uselang=zh-hant',
+ ),
+),
+
'wmgUseMwEmbedSupport' => array(
'default' => true,
'loginwiki' => false,

File Metadata

Mime Type
text/x-diff
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
8294
Default Alt Text
33513.patch (5 KB)

Event Timeline

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL · Credits