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

Conflicts:
	adm/boardgroup_list.php
	adm/mail_list.php
	adm/poll_list.php
This commit is contained in:
whitedot
2013-02-15 18:24:52 +09:00
17 changed files with 197 additions and 113 deletions

View File

@ -184,7 +184,7 @@ function point_clear()
<?=get_paging($config['cf_write_pages'], $page, $total_page, "{$_SERVER['PHP_SELF']}?$qstr&amp;page=");?>
<form id="fpointlist2" name="fpointlist2" method="post" onsubmit="return fpointlist2_submit(this);" autocomplete="off">
<form id="fpointlist2" name="fpointlist2" method="post" action="./point_update.php" autocomplete="off">
<input type="hidden" name="sfl" value="<?=$sfl?>">
<input type="hidden" name="stx" value="<?=$stx?>">
<input type="hidden" name="sst" value="<?=$sst?>">
@ -206,14 +206,6 @@ function point_clear()
</fieldset>
</form>
<script>
function fpointlist2_submit(f)
{
f.action = "./point_update.php";
return true;
}
</script>
<?
include_once ('./admin.tail.php');
?>