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
This commit is contained in:
grum 2010-04-05 20:49:32 +00:00
parent e2fca87c9d
commit 9a33a4ea66
2 changed files with 17 additions and 18 deletions

View file

@ -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);
}