iarv/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-05-03 03:52:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

bug 1580 - remove some hard coded markup (move them to the template)

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

17
include/functions_html.inc.php
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);
}

18
themes/default/template/comment_list.tpl
View File

@@ -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>