Merge branch 'master' of github.com:gnuboard/yc4s

This commit is contained in:
whitedot
2013-12-24 15:30:10 +09:00
9 changed files with 8 additions and 12 deletions

View File

@ -289,7 +289,7 @@ $colspan = 7;
<td class="td_datetime"><?php echo $row['po_datetime'] ?></td>
<td><?php echo $link1.$row['po_content'].$link2 ?></td>
<td class="td_numbig"><?php echo number_format($row['po_point']) ?></td>
<td class="td_numbig"><?php echo number_format($row2['mb_point']) ?></td>
<td class="td_numbig"><?php echo number_format($row['po_mb_point']) ?></td>
</tr>
<?php

View File

@ -22,7 +22,7 @@ if ($w == "")
$sql = " select ca_id from {$g5['g5_shop_category_table']} order by ca_id limit 1 ";
$row = sql_fetch($sql);
if (!$row['ca_id'])
alert("등록된 분류가 없습니다. 우선 분류를 등록하여 주십시오.");
alert("등록된 분류가 없습니다. 우선 분류를 등록하여 주십시오.", './categorylist.php');
$it['ca_id'] = $row['ca_id'];
}
//$it[it_maker] = stripslashes($_COOKIE[ck_maker]);