diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-04-01 19:28:37 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-04-01 19:28:37 +0300 |
| commit | b548389207fbf8e7c0d3287cd8704f05119d853a (patch) | |
| tree | b463fab12ef66897d6c392d104ad618bfb5a6646 /phpBB/styles/prosilver | |
| parent | 4b2ede433e9336cf115fdd41e5c88738b03aa448 (diff) | |
| parent | 2b3cfa0f7b9690907e5a72f6e94e2dc51afbe96b (diff) | |
| download | forums-b548389207fbf8e7c0d3287cd8704f05119d853a.tar forums-b548389207fbf8e7c0d3287cd8704f05119d853a.tar.gz forums-b548389207fbf8e7c0d3287cd8704f05119d853a.tar.bz2 forums-b548389207fbf8e7c0d3287cd8704f05119d853a.tar.xz forums-b548389207fbf8e7c0d3287cd8704f05119d853a.zip | |
Merge remote-tracking branch 'upstream/develop' into ticket/10665
* 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
Diffstat (limited to 'phpBB/styles/prosilver')
| -rw-r--r-- | phpBB/styles/prosilver/template/editor.js | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_warn_front.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/mcp_warn_list.html | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/styles/prosilver/template/editor.js b/phpBB/styles/prosilver/template/editor.js index 2c41b543b5..c16b0ef703 100644 --- a/phpBB/styles/prosilver/template/editor.js +++ b/phpBB/styles/prosilver/template/editor.js @@ -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(); } diff --git a/phpBB/styles/prosilver/template/mcp_warn_front.html b/phpBB/styles/prosilver/template/mcp_warn_front.html index 8f42e28cc0..2f7d939b16 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_front.html +++ b/phpBB/styles/prosilver/template/mcp_warn_front.html @@ -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> diff --git a/phpBB/styles/prosilver/template/mcp_warn_list.html b/phpBB/styles/prosilver/template/mcp_warn_list.html index d9c0bce088..5e43903f11 100644 --- a/phpBB/styles/prosilver/template/mcp_warn_list.html +++ b/phpBB/styles/prosilver/template/mcp_warn_list.html @@ -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> |