mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-25 14:19:58 +09:00
issuetrackerModel::getChangesets() 에서 commit 메시지에 HTML 코드가 들어갈 경우 timeline 목록에서 레이아웃 깨지는 것을 방지하기 위해 htmlspecialchars() 함수를 적용
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6164 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
7a17619b13
commit
09599e7f99
2 changed files with 16 additions and 22 deletions
|
|
@ -157,7 +157,7 @@
|
|||
return $output;
|
||||
}
|
||||
|
||||
function getList($module_srl, $listname)
|
||||
function getList($module_srl, $listname)
|
||||
{
|
||||
if(!$module_srl) return array();
|
||||
|
||||
|
|
@ -201,7 +201,7 @@
|
|||
return $histories;
|
||||
}
|
||||
|
||||
function getPackageList($module_srl, $package_srl=0, $each_releases_count = 0)
|
||||
function getPackageList($module_srl, $package_srl=0, $each_releases_count = 0)
|
||||
{
|
||||
if(!$module_srl) return array();
|
||||
|
||||
|
|
@ -396,18 +396,12 @@
|
|||
if(in_array('commit', $targets))
|
||||
{
|
||||
$output = executeQueryArray("issuetracker.getChangesets", $args);
|
||||
if(!$output->toBool())
|
||||
{
|
||||
return array();
|
||||
}
|
||||
}
|
||||
if(!$output->data)
|
||||
{
|
||||
$output->data = array();
|
||||
}
|
||||
foreach($output->data as $key => $changeset)
|
||||
{
|
||||
$changeset->message = $this->_linkXE($changeset->message);
|
||||
if(!$output->toBool()) return array();
|
||||
if(!$output->data) $output->data = array();
|
||||
|
||||
// message에 htmlspecialchars() 적용
|
||||
foreach($output->data as $key => $changeset)
|
||||
$changeset->message = htmlspecialchars($this->_linkXE($changeset->message));
|
||||
}
|
||||
|
||||
if(in_array('issue_changed', $targets))
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
<!--#include('header.html')-->
|
||||
<!--%load_js_plugin("ui.datepicker")-->
|
||||
<div class="left"><h2> Timeline </h2></div>
|
||||
<div class="left"><h2>Timeline</h2></div>
|
||||
<div class="search">
|
||||
<form action="{getUrl()}" id="fo_search">
|
||||
<br />
|
||||
<input type="hidden" name="act" value="dispIssuetrackerTimeline" />
|
||||
<input type="hidden" name="mid" value="{$mid}" />
|
||||
{$lang->msg_changes_from}:
|
||||
<input type="hidden" name="enddate" id="enddate" class="inputTypeText" value="{$enddate}">
|
||||
{$lang->msg_changes_from}:
|
||||
<input type="hidden" name="enddate" id="enddate" class="inputTypeText" value="{$enddate}" />
|
||||
<input type="text" class="inputDate" value="<!--@if($enddate)-->{zdate($enddate,'Y-m-d')}<!--@end-->" readonly="readonly" />
|
||||
, {$lang->duration}: <input type="text" name="duration" class="inputTypeText w40" value={$duration}>
|
||||
<BR />
|
||||
, {$lang->duration}: <input type="text" name="duration" class="inputTypeText w40" value="{$duration}" />
|
||||
<br />
|
||||
<!--@foreach($lang->target_list as $key => $val)-->
|
||||
<input name="targets[]" type="checkbox" value="{$key}" <!--@if(in_array($key,$targets))-->checked="checked"<!--@end--> id="targets_{$key}"/><label for="targets_{$key}">{$val}</label>
|
||||
<input name="targets[]" type="checkbox" value="{$key}" <!--@if(in_array($key,$targets))-->checked="checked"<!--@end--> id="targets_{$key}"/><label for="targets_{$key}"> {$val}</label>
|
||||
<!--@end-->
|
||||
<a href="#" onclick="xGetElementById('fo_search').submit();return false;" class="button {$btn_class}"><span>{$lang->cmd_update}</span></a>
|
||||
|
||||
|
|
@ -40,8 +40,8 @@
|
|||
<a href="{getUrl('act','dispIssuetrackerViewSource','erev',$changeset->revision,'type','log')}">Changeset <em>[{$changeset->revision}]</em></a> by <span class="author">{$changeset->author}</span>
|
||||
<!--@end-->
|
||||
</dt>
|
||||
<dd class="changeset">
|
||||
<p><!--@if($changeset->type)--><!--@if($changeset->type == "changed")--><span class="status">{$changeset->message}</span><br><!--@endif-->{$issues[$changeset->target_srl]->getContentText(80)}<!--@else-->{$changeset->message}<!--@end--></p> </dd>
|
||||
<dd class="changeset">
|
||||
<p><!--@if($changeset->type)--><!--@if($changeset->type == "changed")--><span class="status">{$changeset->message}</span><br /><!--@endif-->{$issues[$changeset->target_srl]->getContentText(80)}<!--@else-->{$changeset->message}<!--@end--></p></dd>
|
||||
<!--@end-->
|
||||
</dl>
|
||||
<script type="text/javascript">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue