makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1938 from prototech/ticket/12077

Browse source 
[ticket/12077] Ensure that valid upload methods are presented to user in language packs page.
This commit is contained in:
Nathan Guse 2014-01-17 18:28:19 -08:00
commit 8486d6a9d1
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/adm/style/acp_language.html
View file

@ -147,7 +147,7 @@
</tr> </tr>
<tr> <tr>
<td class="row3" style="text-align: right;"> <td class="row3" style="text-align: right;">
<!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}{L_COLON}&nbsp;<!-- BEGIN buttons--><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" />&nbsp;{buttons.VALUE}&nbsp;<!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td> <!-- IF ALLOW_UPLOAD -->&nbsp;&nbsp;{L_UPLOAD_METHOD}{L_COLON}&nbsp;<!-- BEGIN buttons --><input type="radio" class="radio"<!-- IF buttons.S_FIRST_ROW --> id="method" checked="checked"<!-- ENDIF --> value="{buttons.VALUE}" name="method" />&nbsp;{buttons.VALUE}&nbsp;<!-- END buttons --><input type="submit" name="upload_file" class="button2" value="{L_SUBMIT_AND_UPLOAD}" /><!-- ENDIF --></td>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>

6
phpBB/includes/functions_transfer.php
View file

@ -234,7 +234,7 @@ class transfer
/** /**
* Determine methods able to be used * Determine methods able to be used
*/ */
function methods() static public function methods()
{ {
$methods = array(); $methods = array();
$disabled_functions = explode(',', @ini_get('disable_functions')); $disabled_functions = explode(',', @ini_get('disable_functions'));
@ -287,7 +287,7 @@ class ftp extends transfer
/** /**
* Requests data * Requests data
*/ */
function data() static public function data()
{ {
global $user; global $user;
@ -541,7 +541,7 @@ class ftp_fsock extends transfer
/** /**
* Requests data * Requests data
*/ */
function data() static public function data()
{ {
global $user; global $user;