mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 14:00:31 +02:00
further fixes
- fix infinite loop on checking ban for those not having ever visited the page (or removed all session cookies) - avatar width/height switched in language files - fix windows switching to background on IE7 (smlies window for example) git-svn-id: file:///svn/phpbb/trunk@8224 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -34,7 +34,7 @@ function initInsertions()
|
||||
{
|
||||
var doc;
|
||||
|
||||
if( document.forms[form_name])
|
||||
if (document.forms[form_name])
|
||||
{
|
||||
doc = document;
|
||||
}
|
||||
@@ -44,11 +44,16 @@ function initInsertions()
|
||||
}
|
||||
|
||||
var textarea = doc.forms[form_name].elements[text_name];
|
||||
|
||||
if (is_ie && typeof(baseHeight) != 'number')
|
||||
{
|
||||
textarea.focus();
|
||||
baseHeight = doc.selection.createRange().duplicate().boundingHeight;
|
||||
// document.body.focus();
|
||||
|
||||
if (!document.forms[form_name])
|
||||
{
|
||||
document.body.focus();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -14,7 +14,7 @@
|
||||
|
||||
<ol class="def-rules">
|
||||
<!-- BEGIN rule -->
|
||||
<li><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="right-box button2" /><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->: {rule.FOLDER}<!-- ENDIF --></li>
|
||||
<li><div class="right-box"><input type="submit" name="delete_rule[{rule.RULE_ID}]" value="{L_DELETE_RULE}" class="button2" /></div><strong>{L_IF}</strong> {rule.CHECK} <em>{rule.RULE}</em> <!-- IF rule.STRING --><strong>{rule.STRING}</strong> | <!-- ENDIF -->{rule.ACTION}<!-- IF rule.FOLDER -->: {rule.FOLDER}<!-- ENDIF --></li>
|
||||
<!-- BEGINELSE -->
|
||||
<li><strong>{L_NO_RULES_DEFINED}</strong></li>
|
||||
<!-- END rule -->
|
||||
|
@@ -48,7 +48,11 @@ function initInsertions()
|
||||
{
|
||||
textarea.focus();
|
||||
baseHeight = doc.selection.createRange().duplicate().boundingHeight;
|
||||
// document.body.focus();
|
||||
|
||||
if (!document.forms[form_name])
|
||||
{
|
||||
document.body.focus();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user