From aa16e279d064f3eca1ccb533bc54267bb328b918 Mon Sep 17 00:00:00 2001 From: inureyes Date: Fri, 31 Dec 2010 01:31:37 +0000 Subject: [PATCH] =?UTF-8?q?=20closes=20#1443=20=20=20*=20=EC=B9=98?= =?UTF-8?q?=ED=99=98=EC=9E=90=EA=B0=80=20/page/example=EC=9D=B4=20?= =?UTF-8?q?=EC=95=84=EB=8B=88=EB=9D=BC=20/example=EB=A1=9C=20=EC=A0=91?= =?UTF-8?q?=EA=B7=BC=ED=96=88=EC=9D=84=20=EA=B2=BD=EC=9A=B0=EC=97=90?= =?UTF-8?q?=EB=8A=94=20=EC=95=8C=EC=95=84=EC=84=9C=20=EA=B7=B8=20=EC=A3=BC?= =?UTF-8?q?=EC=86=8C=EB=A1=9C=20=EC=A0=88=EB=8C=80=EC=A3=BC=EC=86=8C?= =?UTF-8?q?=EB=A5=BC=20=EC=B6=9C=EB=A0=A5=ED=95=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=ED=95=A8=20=20=20*=20=EA=B8=80=20=EB=81=9D=EC=97=90=20paging?= =?UTF-8?q?=EC=9D=B4=20=EC=95=88=20=EB=B6=99=EB=8F=84=EB=A1=9D=20=ED=95=A8?= =?UTF-8?q?.=20=20=20*=20=EC=BD=94=EB=93=9C=20=EC=9A=94=EC=95=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interface/blog/page.php | 4 ++++ interface/common/blog/entries.php | 8 +++++--- interface/page.php | 31 ++----------------------------- 3 files changed, 11 insertions(+), 32 deletions(-) diff --git a/interface/blog/page.php b/interface/blog/page.php index 0f4245926..bfd5d69ba 100644 --- a/interface/blog/page.php +++ b/interface/blog/page.php @@ -11,6 +11,7 @@ } else { list($entries, $paging) = getEntryWithPaging($blogid, $suri['id'], true); } + if(count($entries) === 1) unset($paging); fireEvent('OBStart'); require ROOT . '/interface/common/blog/begin.php'; @@ -29,6 +30,9 @@ require ROOT . '/interface/common/blog/end.php'; fireEvent('OBEnd'); } else { + if(!empty($freeSlogan)) { + header("HTTP/1.1 404 Not Found");exit; + } list($entries, $paging) = getEntriesWithPagingByPage($blogid, $suri['page'], $blog['entriesOnPage']); fireEvent('OBStart'); require ROOT . '/interface/common/blog/begin.php'; diff --git a/interface/common/blog/entries.php b/interface/common/blog/entries.php index 9420a8733..6c103e656 100644 --- a/interface/common/blog/entries.php +++ b/interface/common/blog/entries.php @@ -39,6 +39,8 @@ $permalink = $context->getProperty('uri.blog')."/notice/" . ($blog['useSloganOnPost'] ? URL::encode($entry['slogan'], $service['useEncodedURL']) : $entry['id']); else if ($suri['directive'] == '/page') $permalink = $context->getProperty('uri.blog')."/page/" . ($blog['useSloganOnPost'] ? URL::encode($entry['slogan'], $service['useEncodedURL']) : $entry['id']); + else if (defined('__TEXTCUBE_PAGE__')) + $permalink = $context->getProperty('uri.blog')."/" . ($blog['useSloganOnPost'] ? URL::encode($entry['slogan'],$service['useEncodedURL']) : $entry['id']); else $permalink = $context->getProperty('uri.blog')."/" . ($blog['useSloganOnPost'] ? "entry/" . URL::encode($entry['slogan'],$service['useEncodedURL']) : $entry['id']); @@ -74,9 +76,9 @@ $entryView = $skin->pageItem; dress('page_rep_microformat_published', Timestamp::getISO8601($entry['published']), $entryView); dress('page_rep_microformat_updated', Timestamp::getISO8601($entry['modified']), $entryView); - dress('page_rep_date', fireEvent('ViewNoticeDate', Timestamp::format5($entry['published']), $entry['published']), $entryView); - dress('page_rep_date_modified', fireEvent('ViewNoticeDate', Timestamp::format5($entry['modified']), $entry['modified']), $entryView); - dress('page_rep_title', htmlspecialchars(fireEvent('ViewNoticeTitle', $entry['title'], $entry['id'])), $entryView); + dress('page_rep_date', fireEvent('ViewPageDate', Timestamp::format5($entry['published']), $entry['published']), $entryView); + dress('page_rep_date_modified', fireEvent('ViewPageDate', Timestamp::format5($entry['modified']), $entry['modified']), $entryView); + dress('page_rep_title', htmlspecialchars(fireEvent('ViewPageTitle', $entry['title'], $entry['id'])), $entryView); dress('page_rep_link', $permalink, $entryView); // 사용자가 작성한 본문은 interface/common/blog/end.php의 removeAllTags() 다음에 처리하기 위한 조치. diff --git a/interface/page.php b/interface/page.php index 8340f1b24..296eb4ee4 100644 --- a/interface/page.php +++ b/interface/page.php @@ -2,33 +2,6 @@ /// Copyright (c) 2004-2010, Needlworks / Tatter Network Foundation /// All rights reserved. Licensed under the GPL. /// See the GNU General Public License for more details. (/documents/LICENSE, /documents/COPYRIGHT) -require ROOT . '/library/preprocessor.php'; - -define('__TEXTCUBE_PAGE__',true); -if (isset($suri['id']) || (isset($suri['value']) && strlen($suri['value']) > 0)) { - if (!isset($suri['id']) || (Setting::getBlogSettingGlobal('useSloganOnPost',1) == 1)) { - list($entries, $paging) = getEntryWithPagingBySlogan($blogid, $suri['value'], true); - } else { - list($entries, $paging) = getEntryWithPaging($blogid, $suri['id'], true); - } - fireEvent('OBStart'); - require ROOT . '/interface/common/blog/begin.php'; - - if (empty($entries)) { - header('HTTP/1.1 404 Not Found'); - if (empty($skin->pageError)) { - dress('article_rep', '
' . _text('존재하지 않는 페이지입니다.') . '
', $view); - } else { - dress('article_rep', NULL, $view); - dress('page_error', $skin->pageError, $view); - } - unset($paging); - } else { - require ROOT . '/interface/common/blog/entries.php'; - } - require ROOT . '/interface/common/blog/end.php'; - fireEvent('OBEnd'); -} else { - header("HTTP/1.1 404 Not Found");exit; -} +$freeSlogan = true; +require ROOT . '/interface/blog/page.php'; ?>