closes #1443

* 치환자가 /page/example이 아니라 /example로 접근했을 경우에는 알아서 그 주소로 절대주소를 출력하도록 함 * 글 끝에 paging이 안 붙도록 함. * 코드 요약
Needlworks · Dec 31, 2010 · aa16e27 · aa16e27
1 parent dd477d7
commit aa16e27
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 32 deletions.
diff --git 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
@@ -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
@@ -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', '<div class="TCwarning">' . _text('존재하지 않는 페이지입니다.') . '</div>', $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';
 ?>