diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-01-17 18:28:19 -0800 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-01-17 18:28:19 -0800 |
| commit | 8486d6a9d15f2f483383286f39abe474917c95ad (patch) | |
| tree | 342bc5169a639270a659187c046048502f9e6b23 | |
| parent | 54afdeb7eeb460502559f6d0c0048c9e89647a8b (diff) | |
| parent | d512197bb9b8ec609746c7bf3e90c78449e89b7b (diff) | |
| download | forums-8486d6a9d15f2f483383286f39abe474917c95ad.tar forums-8486d6a9d15f2f483383286f39abe474917c95ad.tar.gz forums-8486d6a9d15f2f483383286f39abe474917c95ad.tar.bz2 forums-8486d6a9d15f2f483383286f39abe474917c95ad.tar.xz forums-8486d6a9d15f2f483383286f39abe474917c95ad.zip | |
Merge pull request #1938 from prototech/ticket/12077
[ticket/12077] Ensure that valid upload methods are presented to user in language packs page.
| -rw-r--r-- | phpBB/adm/style/acp_language.html | 2 | ||||
| -rw-r--r-- | phpBB/includes/functions_transfer.php | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/adm/style/acp_language.html b/phpBB/adm/style/acp_language.html index f5267e8f7f..d32f6b7eac 100644 --- a/phpBB/adm/style/acp_language.html +++ b/phpBB/adm/style/acp_language.html @@ -147,7 +147,7 @@ </tr> <tr> <td class="row3" style="text-align: right;"> - <!-- IF ALLOW_UPLOAD --> {L_UPLOAD_METHOD}{L_COLON} <!-- BEGIN buttons--><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" /> {buttons.VALUE} <!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td> + <!-- IF ALLOW_UPLOAD --> {L_UPLOAD_METHOD}{L_COLON} <!-- BEGIN buttons --><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" /> {buttons.VALUE} <!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td> </tr> </thead> <tbody> diff --git a/phpBB/includes/functions_transfer.php b/phpBB/includes/functions_transfer.php index 07c9171c60..9bec17ca8f 100644 --- a/phpBB/includes/functions_transfer.php +++ b/phpBB/includes/functions_transfer.php @@ -234,7 +234,7 @@ class transfer /** * Determine methods able to be used */ - function methods() + static public function methods() { $methods = array(); $disabled_functions = explode(',', @ini_get('disable_functions')); @@ -287,7 +287,7 @@ class ftp extends transfer /** * Requests data */ - function data() + static public function data() { global $user; @@ -541,7 +541,7 @@ class ftp_fsock extends transfer /** * Requests data */ - function data() + static public function data() { global $user; |