aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorgrum <grum@piwigo.org>2010-04-05 20:49:32 +0000
committergrum <grum@piwigo.org>2010-04-05 20:49:32 +0000
commit9a33a4ea663becff978d5a03348d23f5b18907e5 (patch)
tree5a3e98e2b2ac91596e0de52c7b82d7607f4a9b2e /include
parente2fca87c9d7012d6531d3e3f2d8d38518ba7a9e2 (diff)
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
Diffstat (limited to '')
-rw-r--r--include/functions_html.inc.php17
1 files changed, 8 insertions, 9 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);
}