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

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>