tonyair
/
silverstripe-blog
mirror of https://github.com/silverstripe/silverstripe-blog
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

ENHANCEMENT: replaced deprecated Director::urlParams() 

BUGFIX: tag working with nested urls
This commit is contained in:
Carlos Barberis 2010-05-27 23:30:14 +00:00
parent 606d526627
commit 5a5cdf1aaf
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/BlogHolder.php
View File

@ -199,8 +199,8 @@ class BlogHolder_Controller extends BlogTree_Controller {
$id = 0;
if(Director::urlParam('ID')) {
$id = (int) Director::urlParam('ID');
if($this->request->latestParam('ID')) {
$id = (int) $this->request->latestParam('ID');
}
$codeparser = new BBCodeParser();

11
code/BlogTree.php
View File

@ -152,6 +152,7 @@ class BlogTree extends Page {
* @return DataObjectSet
*/
public function Entries($limit = '', $tag = '', $date = '', $retrieveCallback = null, $filter = '') {
$tagCheck = '';
$dateCheck = '';
@ -199,7 +200,7 @@ class BlogTree extends Page {
// By specifying a callback, you can alter the SQL, or sort on something other than date.
if($retrieveCallback) return call_user_func($retrieveCallback, 'BlogEntry', $filter, $limit, $order);
return DataObject::get('BlogEntry', $filter, $order, '', $limit);
}
}
@ -290,7 +291,7 @@ class BlogTree_Controller extends Page_Controller {
* @return String
*/
function SelectedTag() {
return (Director::urlParam('Action') == 'tag') ? Director::urlParam('ID') : '';
return ($this->request->latestParam('Action') == 'tag') ? $this->request->latestParam('ID') : '';
}
/**
@ -299,9 +300,9 @@ class BlogTree_Controller extends Page_Controller {
* @return Date
*/
function SelectedDate() {
if(Director::urlParam('Action') == 'date') {
$year = Director::urlParam('ID');
$month = Director::urlParam('OtherID');
if($this->request->latestParam('Action') == 'date') {
$year = $this->request->latestParam('ID');
$month = $this->request->latestParam('OtherID');
if(is_numeric($year) && is_numeric($month) && $month < 13) {
$date = new Date();