joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-29 16:43:42 +00:00
Code Packages Releases Activity

Fixed issue with pagebreak routing

Browse Source 
git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@8611 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
This commit is contained in:
Johan Janssens 2007-08-28 23:53:08 +00:00
parent b5d39f5913
commit e44d564639
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
includes/router.php
View File

@ -149,19 +149,7 @@ class JRouterSite extends JRouter
//Set the variables
$vars = JRequest::get('get');
// Removed any appended variables
/* Do we need this - tcp -> Yes we do but it's broken ! I'll fix
foreach($vars as $key => $value)
{
$this->_vars[$key] = $value;
if($key === 'Itemid') {
break;
}
}
*/
//We only received an Itemid, set the information from the itemid in the
// request
//We only received an Itemid, set the information from the itemid in the request
if(count($vars) == 1) {
JRequest::set($item->query, 'get', false );
}
@ -282,6 +270,14 @@ class JRouterSite extends JRouter
parse_str($url, $vars);
$vars = array_merge($this->_vars, $vars);
foreach($vars as $key => $var)
{
if(empty($var)) {
unset($vars[$key]);
}
}
$url = 'index.php?'.JURI::_buildQuery($vars);
}

6
plugins/content/pagebreak.php
View File

@ -198,7 +198,7 @@ function plgContentCreateTOC( &$row, &$matches, &$page )
$row->toc .= '
<tr>
<td>
<a href="'. JRoute::_( '&limitstart=0') .'" class="toclink">'
<a href="'. JRoute::_( '&showall=&limitstart=0') .'" class="toclink">'
. $heading .
'</a>
</td>
@ -209,7 +209,7 @@ function plgContentCreateTOC( &$row, &$matches, &$page )
foreach ( $matches as $bot )
{
$link = JRoute::_( '&limitstart='. ($i-1) );
$link = JRoute::_( '&showall=&limitstart='. ($i-1) );
if ( @$bot[1] )
{
@ -262,7 +262,7 @@ function plgContentCreateTOC( &$row, &$matches, &$page )
if ($params->get('showall') )
{
$link = JRoute::_( '&showall=1');
$link = JRoute::_( '&showall=1&limitstart=');
$row->toc .= '
<tr>
<td>