diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-30 16:14:39 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-01-30 16:14:39 +0000 |
| commit | 4b5fab372ff69a809144dee3a0a7f90c219fe400 (patch) | |
| tree | 3835425dae514f7296b6aaf77eed81c7f2617a5f /phpBB/includes/functions_content.php | |
| parent | 140746089594307c9bc2ad084ea2355dcbddbe16 (diff) | |
| download | forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar.gz forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar.bz2 forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.tar.xz forums-4b5fab372ff69a809144dee3a0a7f90c219fe400.zip | |
merge with revision #r8350
git-svn-id: file:///svn/phpbb/trunk@8351 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index b601e3a60c..5f148da2f8 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -67,7 +67,7 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, $sort_dir = key($sort_dir_text); } - $s_limit_days = '<select name="st">'; + $s_limit_days = '<select name="st" id="st">'; foreach ($limit_days as $day => $text) { $selected = ($sort_days == $day) ? ' selected="selected"' : ''; @@ -75,7 +75,7 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, } $s_limit_days .= '</select>'; - $s_sort_key = '<select name="sk">'; + $s_sort_key = '<select name="sk" id="sk">'; foreach ($sort_by_text as $key => $text) { $selected = ($sort_key == $key) ? ' selected="selected"' : ''; @@ -83,7 +83,7 @@ function gen_sort_selects(&$limit_days, &$sort_by_text, &$sort_days, &$sort_key, } $s_sort_key .= '</select>'; - $s_sort_dir = '<select name="sd">'; + $s_sort_dir = '<select name="sd" id="sd">'; foreach ($sort_dir_text as $key => $value) { $selected = ($sort_dir == $key) ? ' selected="selected"' : ''; @@ -382,7 +382,7 @@ function strip_bbcode(&$text, $uid = '') $match = get_preg_expression('bbcode_htm'); $replace = array('\1', '\1', '\2', '\1', '', ''); - + $text = preg_replace($match, $replace, $text); } @@ -418,7 +418,7 @@ function generate_text_for_display($text, $uid, $bitfield, $flags) { $bbcode->bbcode($bitfield); } - + $bbcode->bbcode_second_pass($text, $uid); } @@ -802,7 +802,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, $template->destroy_block_vars('_file'); $block_array = array(); - + // Some basics... $attachment['extension'] = strtolower(trim($attachment['extension'])); $filename = $phpbb_root_path . $config['upload_path'] . '/' . basename($attachment['physical_filename']); @@ -1084,7 +1084,7 @@ function truncate_string($string, $max_length = 60, $allow_reply = true, $append { $string = 'Re: ' . $string; } - + if ($append != '' && $stripped) { $string = $string . $append; @@ -1203,7 +1203,7 @@ class bitfield if (strlen($this->data) >= $byte + 1) { $c = $this->data[$byte]; - + // Lookup the ($n % 8)th bit of the byte $bit = 7 - ($n & 7); return (bool) (ord($c) & (1 << $bit)); |