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

Merge r10472 and r10474 into the 3.0.7 branch

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10475 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Josh Woody 2010-02-04 01:06:25 +00:00
parent 20301d6b9f
commit dec3e2f728
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/docs/CHANGELOG.html
View file

@ -153,6 +153,7 @@
<li>[Fix] Fix language string for PM-Reports refering to post-data. (Bug #54745)</li> <li>[Fix] Fix language string for PM-Reports refering to post-data. (Bug #54745)</li>
<li>[Fix] Do not store email templates in database. (Bug #54505)</li> <li>[Fix] Do not store email templates in database. (Bug #54505)</li>
<li>[Fix] Fix javascript bug in the smilies ACP. (Bug #55725)</li> <li>[Fix] Fix javascript bug in the smilies ACP. (Bug #55725)</li>
<li>[Fix] Unify BBCode Selection across browsers. (Bug #38765)</li>
<li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li>
<li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li>
<li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li>

4
phpBB/styles/prosilver/template/editor.js
View file

@ -323,8 +323,8 @@ function mozWrap(txtarea, open, close)
var s3 = (txtarea.value).substring(selEnd, selLength); var s3 = (txtarea.value).substring(selEnd, selLength);
txtarea.value = s1 + open + s2 + close + s3; txtarea.value = s1 + open + s2 + close + s3;
txtarea.selectionStart = selEnd + open.length + close.length; txtarea.selectionStart = selStart + open.length;
txtarea.selectionEnd = txtarea.selectionStart; txtarea.selectionEnd = selEnd + open.length;
txtarea.focus(); txtarea.focus();
txtarea.scrollTop = scrollTop; txtarea.scrollTop = scrollTop;

4
phpBB/styles/subsilver2/template/editor.js
View file

@ -276,8 +276,8 @@ function mozWrap(txtarea, open, close)
var s3 = (txtarea.value).substring(selEnd, selLength); var s3 = (txtarea.value).substring(selEnd, selLength);
txtarea.value = s1 + open + s2 + close + s3; txtarea.value = s1 + open + s2 + close + s3;
txtarea.selectionStart = selEnd + open.length + close.length; txtarea.selectionStart = selStart + open.length;
txtarea.selectionEnd = txtarea.selectionStart; txtarea.selectionEnd = selEnd + open.length;
txtarea.focus(); txtarea.focus();
txtarea.scrollTop = scrollTop; txtarea.scrollTop = scrollTop;