diff options
| author | Lester Caine ext:(%22) <lester@lsces.co.uk> | 2012-04-29 16:04:08 +0100 |
|---|---|---|
| committer | Lester Caine ext:(%22) <lester@lsces.co.uk> | 2012-04-29 16:04:08 +0100 |
| commit | 1102d743d9e4a1e358116fe86afd68f10c76d9bb (patch) | |
| tree | b673f52b4146f8a47489cce31650738496a33428 | |
| parent | 26322d2728a16fcbaa01727b3b705c521c4e3263 (diff) | |
| download | articles-1102d743d9e4a1e358116fe86afd68f10c76d9bb.tar.gz articles-1102d743d9e4a1e358116fe86afd68f10c76d9bb.tar.bz2 articles-1102d743d9e4a1e358116fe86afd68f10c76d9bb.zip | |
Roll back getContentUrl to alternate static getDisplayUrl fix
getDisplayUrlFrom Hash used for static calls
| -rw-r--r-- | BitArticle.php | 9 | ||||
| -rw-r--r-- | test/TestTikiArticle.php | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/BitArticle.php b/BitArticle.php index f48f64d..36ef1a2 100644 --- a/BitArticle.php +++ b/BitArticle.php @@ -117,7 +117,7 @@ class BitArticle extends LibertyMime { $this->mInfo['thumbnail_url'] = BitArticle::getImageThumbnails( $this->mInfo ); $this->mInfo['creator'] = ( !empty( $this->mInfo['creator_real_name'] ) ? $this->mInfo['creator_real_name'] : $this->mInfo['creator_user'] ); $this->mInfo['editor'] = ( !empty( $this->mInfo['modifier_real_name'] ) ? $this->mInfo['modifier_real_name'] : $this->mInfo['modifier_user'] ); - $this->mInfo['display_url'] = $this->getContentUrl(); + $this->mInfo['display_url'] = $this->getDisplayUrl(); // we need the raw data to display in the textarea $this->mInfo['raw'] = $this->mInfo['data']; // here we have the displayed data without the ...split... stuff @@ -632,13 +632,6 @@ class BitArticle extends LibertyMime { return $ret; } - function getContentUrl( $pArticleId = NULL ) { - if( !@BitBase::verifyId( $pArticleId ) && $this->isValid() ) { - $pArticleId = $this->mArticleId; - } - - return self::getDisplayUrl($pArticleId); - } /** * get a list of all available statuses * @return an array of available statuses diff --git a/test/TestTikiArticle.php b/test/TestTikiArticle.php index e5271bb..48e3660 100644 --- a/test/TestTikiArticle.php +++ b/test/TestTikiArticle.php @@ -67,7 +67,7 @@ class TestBitArticle extends Test { function testUrlItem() { - Assert::equalsTrue($this->test->getContentUrl() != ""); + Assert::equalsTrue($this->test->getDisplayUrl() != ""); } function testExpungeItem() |