From b05a9f5431d77f2f73ec3ccc9470363ccabb1c3d Mon Sep 17 00:00:00 2001 From: zero Date: Wed, 3 Jun 2009 05:37:54 +0000 Subject: [PATCH] =?UTF-8?q?Context::getUrl()=EC=9D=98=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=9D=BC=20=EA=B8=80/=EB=8C=93=EA=B8=80/?= =?UTF-8?q?=EC=97=AE=EC=9D=B8=EA=B8=80=20=EC=A3=BC=EC=86=8C=20=EB=B0=8F=20?= =?UTF-8?q?=EC=B9=B4=ED=8E=98=20=EC=A3=BC=EC=86=8C=EC=97=90=20=EB=8C=80?= =?UTF-8?q?=ED=95=B4=20http=EB=A1=9C=20=EC=8B=9C=EC=9E=91=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EA=B0=92=EC=9D=84=20=EA=B5=AC=ED=95=B4=EC=84=9C=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: http://xe-core.googlecode.com/svn/sandbox@6468 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- modules/comment/comment.item.php | 4 +++- modules/document/document.item.php | 4 +++- modules/homepage/homepage.view.php | 4 ++++ modules/homepage/skins/xe_default/index.html | 2 +- modules/trackback/trackback.model.php | 4 +++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php index 943393f48..8c3b599c0 100644 --- a/modules/comment/comment.item.php +++ b/modules/comment/comment.item.php @@ -255,7 +255,9 @@ } function getPermanentUrl() { - return getUrl('','document_srl',$this->get('document_srl')).'#comment_'.$this->get('comment_srl'); + $url = getUrl('','document_srl',$this->get('document_srl')).'#comment_'.$this->get('comment_srl'); + if(substr($url,0,1)=='/') $url = substr(Context::getRequestUri(),0,-1).$url; + return $url; } diff --git a/modules/document/document.item.php b/modules/document/document.item.php index d0aa3c783..4bb4c01b9 100644 --- a/modules/document/document.item.php +++ b/modules/document/document.item.php @@ -376,7 +376,9 @@ } function getPermanentUrl() { - return getUrl('','document_srl',$this->document_srl); + $url = getUrl('','document_srl',$this->get('document_srl')); + if(substr($url,0,1)=='/') $url = substr(Context::getRequestUri(),0,-1).$url; + return $url; } function getTrackbackUrl() { diff --git a/modules/homepage/homepage.view.php b/modules/homepage/homepage.view.php index e4beb2ba9..23eabb343 100644 --- a/modules/homepage/homepage.view.php +++ b/modules/homepage/homepage.view.php @@ -69,6 +69,10 @@ foreach($output->data as $key => $val) { $banner_src = 'files/attach/cafe_banner/'.$val->site_srl.'.jpg'; if(file_exists(_XE_PATH_.$banner_src)) $output->data[$key]->cafe_banner = $banner_src.'?rnd='.filemtime(_XE_PATH_.$banner_src); + + $url = getSiteUrl($val->domain,''); + if(substr($url,0,1)=='/') $url = substr(Context::getRequestUri(),0,-1).$url; + $output->data[$key]->url = $url; } } Context::set('total_count', $output->total_count); diff --git a/modules/homepage/skins/xe_default/index.html b/modules/homepage/skins/xe_default/index.html index 693cf24d1..1721fd226 100644 --- a/modules/homepage/skins/xe_default/index.html +++ b/modules/homepage/skins/xe_default/index.html @@ -34,7 +34,7 @@ {preg_replace('/<([^>]+)>/i','',$val->cafe_description)} - {getSiteUrl($val->domain)} + {$val->url} diff --git a/modules/trackback/trackback.model.php b/modules/trackback/trackback.model.php index ce32bf0d6..562122771 100644 --- a/modules/trackback/trackback.model.php +++ b/modules/trackback/trackback.model.php @@ -132,7 +132,9 @@ * trackback url에 key값을 추가함. **/ function getTrackbackUrl($document_srl) { - return getUrl('','document_srl',$document_srl,'act','trackback','key',$this->getTrackbackKey($document_srl)); + $url = getUrl('','document_srl',$document_srl,'act','trackback','key',$this->getTrackbackKey($document_srl)); + if(substr($url,0,1)=='/') $url = substr(Context::getRequestUri(),0,-1).$url; + return $url; } /**