From b18e402913eb347a0c035f836666c5710f53711c Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Fri, 15 Mar 2013 16:44:51 +0900
Subject: [PATCH] =?UTF-8?q?#401=20=EC=97=90=20=EB=94=B0=EB=A5=B8=20po=5Fid?=
 =?UTF-8?q?=20max=20=EA=B0=92=EC=9D=84=20=EA=B5=AC=ED=95=B4=EC=84=9C=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=BD=94?=
 =?UTF-8?q?=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/poll.lib.php              | 14 +++++++++-----
 skin/poll/basic/poll.skin.php | 14 --------------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/lib/poll.lib.php b/lib/poll.lib.php
index 312fb3d3e..93c9ad89f 100644
--- a/lib/poll.lib.php
+++ b/lib/poll.lib.php
@@ -4,15 +4,19 @@ if (!defined('_GNUBOARD_')) exit;
 // 설문조사
 function poll($skin_dir='basic', $po_id=false)
 {
-    global $config, $member, $g4;
+    global $config, $member, $g4, $is_admin;
 
     // 투표번호가 넘어오지 않았다면 가장 큰(최근에 등록한) 투표번호를 얻는다
-    if (empty($po_id)) {
-        $po_id = $config['cf_max_po_id'];
-        if (empty($po_id))
-            return "<!-- po_id를 찾을 수 없습니다. -->";
+    if (!$po_id) {
+        $row = sql_fetch(" select MAX(po_id) as max_po_id from {$g4['poll_table']} ");
+        $po_id = $row['max_po_id'];
     }
 
+    if(!$po_id)
+        return;
+
+    $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
+
     ob_start();
     if (G4_IS_MOBILE) {
         $poll_skin_path = G4_MOBILE_PATH.'/'.G4_SKIN_DIR.'/poll/'.$skin_dir;
diff --git a/skin/poll/basic/poll.skin.php b/skin/poll/basic/poll.skin.php
index 37886df70..2b2f8ecf3 100644
--- a/skin/poll/basic/poll.skin.php
+++ b/skin/poll/basic/poll.skin.php
@@ -1,19 +1,5 @@
 <?
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
-
-global $is_admin;
-
-// 투표번호가 넘어오지 않았다면 가장 큰(최근에 등록한) 투표번호를 얻는다
-if (!$po_id) {
-    $po_id = $config['cf_max_po_id'];
-
-    if (!$po_id) return;
-}
-
-$po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
-
-if(!$po['po_id'])
-    return;
 ?>
 
 <form name="fpoll" action="<?=G4_BBS_URL?>/poll_update.php" onsubmit="return fpoll_submit(this);" target="win_poll" method="post">