g4s merge 충돌수정

2013-06-25 16:40:16 +09:00
parent 5cb1c0519e 5bc81f27a9
commit 5ca0975f21
7 changed files with 50 additions and 46 deletions
--- a/plugin/syndi/func/site.func.php
+++ b/plugin/syndi/func/site.func.php
@ -110,7 +110,6 @@ function _Syndi_getNextChannelId($channel_id=null)
 		$sql .= " order by b.gr_id,b.bo_table limit 1";

 		$row = sql_fetch($sql);
-		sql_free_result($result);

 		return $row['bo_table'];
 	}