From 9a33a4ea663becff978d5a03348d23f5b18907e5 Mon Sep 17 00:00:00 2001 From: grum Date: Mon, 5 Apr 2010 20:49:32 +0000 Subject: bug 1580 - remove some hard coded markup (move them to the template) git-svn-id: http://piwigo.org/svn/trunk@5682 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_html.inc.php | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'include/functions_html.inc.php') 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 = '$1$2'; $content = preg_replace($pattern, $replacement, $content); - $content = '
'.$content.'
'; 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); } -- cgit v1.2.3