mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into ticket/10665

Browse Source 
* upstream/develop:
  [ticket/10733] Fixing test
  [ticket/10733] Removing static from data providers
  [ticket/10731] Fixed addquote() to work on opera browser.
  [ticket/10731] Fixed addquote() to work on opera browser.
  [Ticket/10675] Correct language string ATTACH_DISK_FULL
  [feature/event-dispatcher] Adding composer.phar to .gitignore for olympus
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in subsilver2
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in prosilver
  [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
  [ticket/10675] Add disk full language string when posting attachments
This commit is contained in:
Vjacheslav Trushkin
2012-04-01 19:28:37 +03:00
parent 4b2ede433e 2b3cfa0f7b
commit b548389207
20 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/includes/functions_posting.php
View File

@@ -496,7 +496,14 @@ function upload_attachment($form_name, $forum_id, $local = false, $local_storage
{
if ($free_space <= $file->get('filesize'))
{
$filedata['error'][] = $user->lang['ATTACH_QUOTA_REACHED'];
if ($auth->acl_get('a_'))
{
$filedata['error'][] = $user->lang['ATTACH_DISK_FULL'];
}
else
{
$filedata['error'][] = $user->lang['ATTACH_QUOTA_REACHED'];
}
$filedata['post_attach'] = false;
$file->remove();

2
phpBB/language/en/mcp.php
View File

@@ -389,7 +389,7 @@ $lang = array_merge($lang, array(
'WARNING_PM_BODY' => 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]',
'WARNING_PM_SUBJECT' => 'Board warning issued',
'WARNING_POST_DEFAULT' => 'This is a warning regarding the following post made by you: %s .',
'WARNINGS_ZERO_TOTAL' => 'No warnings exist.',
'NO_WARNINGS' => 'No warnings exist.',
'YOU_SELECTED_TOPIC' => 'You selected topic number %d: %s.',

1
phpBB/language/en/posting.php
View File

@@ -41,6 +41,7 @@ $lang = array_merge($lang, array(
'ADD_POLL' => 'Poll creation',
'ADD_POLL_EXPLAIN' => 'If you do not want to add a poll to your topic leave the fields blank.',
'ALREADY_DELETED' => 'Sorry but this message is already deleted.',
'ATTACH_DISK_FULL' => 'There is not enough free disk space to post this attachment.',
'ATTACH_QUOTA_REACHED' => 'Sorry, the board attachment quota has been reached.',
'ATTACH_SIG' => 'Attach a signature (signatures can be altered via the UCP)',

2
phpBB/styles/prosilver/template/editor.js
View File

@@ -219,7 +219,7 @@ function addquote(post_id, username, l_wrote)
// Get text selection - not only the post content :(
// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
if (window.getSelection && !is_ie)
if (window.getSelection && !is_ie && !window.opera)
{
theSelection = window.getSelection().toString();
}

4
phpBB/styles/prosilver/template/mcp_warn_front.html
View File

@@ -55,7 +55,7 @@
</tbody>
</table>
<!-- ELSE -->
<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
<p><strong>{L_NO_WARNINGS}</strong></p>
<!-- ENDIF -->
<span class="corners-bottom"><span></span></span></div>
@@ -88,7 +88,7 @@
</tbody>
</table>
<!-- ELSE -->
<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
<p><strong>{L_NO_WARNINGS}</strong></p>
<!-- ENDIF -->
<span class="corners-bottom"><span></span></span></div>

2
phpBB/styles/prosilver/template/mcp_warn_list.html
View File

@@ -53,7 +53,7 @@
</li>
</ul>
<!-- ELSE -->
<p><strong>{L_WARNINGS_ZERO_TOTAL}</strong></p>
<p><strong>{L_NO_WARNINGS}</strong></p>
<!-- ENDIF -->
<span class="corners-bottom"><span></span></span></div>

2
phpBB/styles/subsilver2/template/editor.js
View File

@@ -221,7 +221,7 @@ function addquote(post_id, username, l_wrote)
// Get text selection - not only the post content :(
// IE9 must use the document.selection method but has the *.getSelection so we just force no IE
if (window.getSelection && !is_ie)
if (window.getSelection && !is_ie && !window.opera)
{
theSelection = window.getSelection().toString();
}

4
phpBB/styles/subsilver2/template/mcp_warn_front.html
View File

@@ -38,7 +38,7 @@
</tr>
<!-- BEGINELSE -->
<tr>
<td class="row1" colspan="4" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td>
<td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
</tr>
<!-- END highest -->
</table>
@@ -64,7 +64,7 @@
</tr>
<!-- BEGINELSE -->
<tr>
<td class="row1" colspan="4" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td>
<td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
</tr>
<!-- END latest -->
</table>

2
phpBB/styles/subsilver2/template/mcp_warn_list.html
View File

@@ -21,7 +21,7 @@
</tr>
<!-- BEGINELSE -->
<tr>
<td class="row1" colspan="4" align="center"><span class="gen">{L_WARNINGS_ZERO_TOTAL}</span></td>
<td class="row1" colspan="4" align="center"><span class="gen">{L_NO_WARNINGS}</span></td>
</tr>
<!-- END user -->
<tr align="center">