Fz-29 has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/343457 )
Change subject: Issue Solved - $wgMaxUploadSize being an array causes an error in Page Forms ...................................................................... Issue Solved - $wgMaxUploadSize being an array causes an error in Page Forms In the page form upload window, if wgMaxUplaodSize was an array, a fatal error would be thrown by. This issue has been solved now and thus $wgMaxUploadSize can now be integer as well as an array. Bug: T160687 Change-Id: Ib9ea0fc5a5ce231cf0ade117946f5fb6b169c63e --- M specials/PF_UploadForm.php 1 file changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms refs/changes/57/343457/1 diff --git a/specials/PF_UploadForm.php b/specials/PF_UploadForm.php index f640520..14310e9 100644 --- a/specials/PF_UploadForm.php +++ b/specials/PF_UploadForm.php @@ -100,6 +100,23 @@ ); } + $maxUploadSizeFile = ini_get( 'upload_max_filesize' ); + $maxUploadSizeURL = ini_get( 'upload_max_filesize' ); + global $wgMaxUploadSize; + if(isset($wgMaxUploadSize)) + { + if(gettype($wgMaxUploadSize) == "array") + { + $maxUploadSizeFile = $wgMaxUploadSize['*']; + $maxUploadSizeURL = $wgMaxUploadSize['url']; + } + else + { + $maxUploadSizeFile = $wgMaxUploadSize; + $maxUploadSizeURL = $wgMaxUploadSize; + } + } + $descriptor['UploadFile'] = array( 'class' => 'PFUploadSourceField', 'section' => 'source', @@ -110,13 +127,12 @@ 'radio' => &$radio, 'help' => wfMessage( 'upload-maxfilesize', $this->getLanguage()->formatSize( - wfShorthandToInteger( ini_get( 'upload_max_filesize' ) ) + wfShorthandToInteger( $maxUploadSizeFile ) ) )->parse() . ' ' . wfMessage( 'upload_source_file' )->escaped(), 'checked' => $selectedSourceType == 'file', ); if ( $canUploadByUrl ) { - global $wgMaxUploadSize; $descriptor['UploadFileURL'] = array( 'class' => 'UploadSourceField', 'section' => 'source', @@ -125,7 +141,7 @@ 'upload-type' => 'Url', 'radio' => &$radio, 'help' => wfMessage( 'upload-maxfilesize', - $this->getLanguage()->formatSize( $wgMaxUploadSize ) + $this->getLanguage()->formatSize( $maxUploadSizeURL ) )->parse() . ' ' . wfMessage( 'upload_source_url' )->escaped(), 'checked' => $selectedSourceType == 'url', ); -- To view, visit https://gerrit.wikimedia.org/r/343457 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib9ea0fc5a5ce231cf0ade117946f5fb6b169c63e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: master Gerrit-Owner: Fz-29 <f29ah...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits