diff options
| -rw-r--r-- | include/functions_html.inc.php | 17 | ||||
| -rw-r--r-- | themes/default/template/comment_list.tpl | 18 |
2 files changed, 17 insertions, 18 deletions
diff --git a/include/functions_html.inc.php b/include/functions_html.inc.php index 1cabb3acd..5aa512685 100644 --- a/include/functions_html.inc.php +++ b/include/functions_html.inc.php @@ -199,7 +199,6 @@ function parse_comment_content($content) $replacement = '<span style="font-style:italic;">$1$2</span>'; $content = preg_replace($pattern, $replacement, $content); - $content = '<div>'.$content.'</div>'; return $content; } @@ -457,18 +456,18 @@ function set_status_header($code, $text='') case 503: $text='Service unavailable';break; } } - $protocol = $_SERVER["SERVER_PROTOCOL"]; - if ( ('HTTP/1.1' != $protocol) && ('HTTP/1.0' != $protocol) ) - $protocol = 'HTTP/1.0'; + $protocol = $_SERVER["SERVER_PROTOCOL"]; + if ( ('HTTP/1.1' != $protocol) && ('HTTP/1.0' != $protocol) ) + $protocol = 'HTTP/1.0'; - if ( version_compare( phpversion(), '4.3.0', '>=' ) ) + if ( version_compare( phpversion(), '4.3.0', '>=' ) ) { - header( "$protocol $code $text", true, $code ); - } + header( "$protocol $code $text", true, $code ); + } else { - header( "$protocol $code $text" ); - } + header( "$protocol $code $text" ); + } trigger_action('set_status_header', $code, $text); } diff --git a/themes/default/template/comment_list.tpl b/themes/default/template/comment_list.tpl index 117979bce..c3e5eb791 100644 --- a/themes/default/template/comment_list.tpl +++ b/themes/default/template/comment_list.tpl @@ -40,16 +40,16 @@ {if isset($comment.IN_EDIT)} <a name="edit_comment"></a> <form method="post" action="{$comment.U_EDIT}" class="filter" id="editComment"> - <fieldset> - <legend>{'Edit a comment'|@translate}</legend> - <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label> - <input type="hidden" name="key" value="{$comment.KEY}"> - <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}"> - <input class="submit" type="submit" value="{'Submit'|@translate}"> - </fieldset> + <fieldset> + <legend>{'Edit a comment'|@translate}</legend> + <label>{'Comment'|@translate}<textarea name="content" id="contenteditid" rows="5" cols="80">{$comment.CONTENT|@escape}</textarea></label> + <input type="hidden" name="key" value="{$comment.KEY}"> + <input type="hidden" name="image_id" value="{$comment.IMAGE_ID|@default:$current.id}"> + <input class="submit" type="submit" value="{'Submit'|@translate}"> + </fieldset> </form> - {else} - <blockquote>{$comment.CONTENT}</blockquote> + {else} + <blockquote><div>{$comment.CONTENT}</div></blockquote> {/if} </div> </div> |