mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-26 20:08:55 +00:00
some bugfixes.
git-svn-id: file:///svn/phpbb/trunk@8138 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
2cd7f67ed5
commit
c208556578
5 changed files with 19 additions and 4 deletions
|
@ -110,6 +110,9 @@
|
||||||
<li>[Fix] Correctly delete excess poll options (Bug #14566)</li>
|
<li>[Fix] Correctly delete excess poll options (Bug #14566)</li>
|
||||||
<li>[Fix] Allow names evaluating to false for poll options</li>
|
<li>[Fix] Allow names evaluating to false for poll options</li>
|
||||||
<li>[Change] use in-build functions for user online list (#14596) - provided by rxu</li>
|
<li>[Change] use in-build functions for user online list (#14596) - provided by rxu</li>
|
||||||
|
<li>[Fix] Fixing google cache display problems with Firefox (#14472) - patch provided by Raimon</li>
|
||||||
|
<li>[Fix] Prevent topic unlocking if locked by someone else while posting (#10307)</li>
|
||||||
|
<li>[Change] Allow years in future be selected for date custom profile field (#14519)</li>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
|
@ -113,7 +113,7 @@ class custom_profile
|
||||||
return 'FIELD_REQUIRED';
|
return 'FIELD_REQUIRED';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($day < 0 || $day > 31 || $month < 0 || $month > 12 || ($year < 1901 && $year > 0) || $year > gmdate('Y', time()))
|
if ($day < 0 || $day > 31 || $month < 0 || $month > 12 || ($year < 1901 && $year > 0) || $year > gmdate('Y', time()) + 50)
|
||||||
{
|
{
|
||||||
return 'FIELD_INVALID_DATE';
|
return 'FIELD_INVALID_DATE';
|
||||||
}
|
}
|
||||||
|
|
|
@ -316,7 +316,7 @@ class ucp_profile
|
||||||
$validate_array = array_merge($validate_array, array(
|
$validate_array = array_merge($validate_array, array(
|
||||||
'bday_day' => array('num', true, 1, 31),
|
'bday_day' => array('num', true, 1, 31),
|
||||||
'bday_month' => array('num', true, 1, 12),
|
'bday_month' => array('num', true, 1, 12),
|
||||||
'bday_year' => array('num', true, 1901, gmdate('Y', time())),
|
'bday_year' => array('num', true, 1901, gmdate('Y', time()) + 50),
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1187,7 +1187,7 @@ $bbcode_checked = (isset($post_data['enable_bbcode'])) ? !$post_data['enable_bb
|
||||||
$smilies_checked = (isset($post_data['enable_smilies'])) ? !$post_data['enable_smilies'] : (($config['allow_smilies']) ? !$user->optionget('smilies') : 1);
|
$smilies_checked = (isset($post_data['enable_smilies'])) ? !$post_data['enable_smilies'] : (($config['allow_smilies']) ? !$user->optionget('smilies') : 1);
|
||||||
$urls_checked = (isset($post_data['enable_urls'])) ? !$post_data['enable_urls'] : 0;
|
$urls_checked = (isset($post_data['enable_urls'])) ? !$post_data['enable_urls'] : 0;
|
||||||
$sig_checked = $post_data['enable_sig'];
|
$sig_checked = $post_data['enable_sig'];
|
||||||
$lock_topic_checked = (isset($topic_lock)) ? $topic_lock : (($post_data['topic_status'] == ITEM_LOCKED) ? 1 : 0);
|
$lock_topic_checked = (isset($topic_lock) && $topic_lock) ? $topic_lock : (($post_data['topic_status'] == ITEM_LOCKED) ? 1 : 0);
|
||||||
$lock_post_checked = (isset($post_lock)) ? $post_lock : $post_data['post_edit_locked'];
|
$lock_post_checked = (isset($post_lock)) ? $post_lock : $post_data['post_edit_locked'];
|
||||||
|
|
||||||
// If the user is replying or posting and not already watching this topic but set to always being notified we need to overwrite this setting
|
// If the user is replying or posting and not already watching this topic but set to always being notified we need to overwrite this setting
|
||||||
|
|
|
@ -42,11 +42,23 @@ html>body dd label input { vertical-align: text-bottom; } /* Align checkboxes/ra
|
||||||
visibility: hidden;
|
visibility: hidden;
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
.clearfix, #tabs, #minitabs, .post, .navbar, fieldset dl, ul.topiclist dl, ul.linklist, dl.polls {
|
.clearfix, #tabs, #minitabs, fieldset dl, ul.topiclist dl, dl.polls {
|
||||||
height: 1%;
|
height: 1%;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* viewtopic fix */
|
||||||
|
* html .post {
|
||||||
|
height: 25%;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* navbar fix */
|
||||||
|
* html .clearfix, * html .navbar, ul.linklist {
|
||||||
|
height: 4%;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
|
|
||||||
/* Simple fix so forum and topic lists always have a min-height set, even in IE6
|
/* Simple fix so forum and topic lists always have a min-height set, even in IE6
|
||||||
From http://www.dustindiaz.com/min-height-fast-hack */
|
From http://www.dustindiaz.com/min-height-fast-hack */
|
||||||
dl.icon {
|
dl.icon {
|
||||||
|
|
Loading…
Add table
Reference in a new issue