Changeset 1535 for trunk/system/views/pagination/classic.php

Timestamp:

12/14/2007 03:27:07 PM (13 months ago)

Author:

Geert

Message:

Pagination library update:

• Fixed bug that made it impossible to change uri_segment via initialize() without explicitely passing base_url again. (Also see: http://forum.kohanaphp.com/index.php/topic,389.0.html)
  
• The generic url (used in the pagination style views) is now stored in $url. Shorter, keeps your views a bit cleaner and $base_url is reserved to be set by user.
  
• Made $base_url, $directory, $style and $uri_segment private. They should not be available in pagination views.
  

Files:

• trunk/system/views/pagination/classic.php (modified) (3 diffs)

trunk/system/views/pagination/classic.php

@@ -10 +10 @@
         
         <?php if ($first_page): ?>
-                <a href="<?php echo str_replace('{page}', 1, $base_url) ?>">&lsaquo;&nbsp;<?php echo Kohana::lang('pagination.first') ?></a>
+                <a href="<?php echo str_replace('{page}', 1, $url) ?>">&lsaquo;&nbsp;<?php echo Kohana::lang('pagination.first') ?></a>
         <?php endif; ?>
 
         <?php if ($previous_page): ?>
-                <a href="<?php echo str_replace('{page}', $previous_page, $base_url) ?>">&lt;</a>
+                <a href="<?php echo str_replace('{page}', $previous_page, $url) ?>">&lt;</a>
         <?php endif; ?>
         
@@ -23 +23 @@
                         <strong><?php echo $i ?></strong>
                 <?php else: ?>
-                        <a href="<?php echo str_replace('{page}', $i, $base_url) ?>"><?php echo $i ?></a>
+                        <a href="<?php echo str_replace('{page}', $i, $url) ?>"><?php echo $i ?></a>
                 <?php endif; ?>
                 
@@ -30 +30 @@
 
         <?php if ($next_page): ?>
-                <a href="<?php echo str_replace('{page}', $next_page, $base_url) ?>">&gt;</a>
+                <a href="<?php echo str_replace('{page}', $next_page, $url) ?>">&gt;</a>
         <?php endif; ?>
 
         <?php if ($last_page): ?>
-                <a href="<?php echo str_replace('{page}', $last_page, $base_url) ?>"><?php echo Kohana::lang('pagination.last') ?>&nbsp;&rsaquo;</a>
+                <a href="<?php echo str_replace('{page}', $last_page, $url) ?>"><?php echo Kohana::lang('pagination.last') ?>&nbsp;&rsaquo;</a>
         <?php endif; ?>