Quick Search:

Mode

Context

Displaying 3 lines of context. None | Less | More | Full

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

658
 
754
 
754
 
database.php
_> 11 <?php
  22 /*
<> 3 -  $Id: database.php 658 2006-07-27 13:31:21Z hpdl $
   3+  $Id: database.php 754 2006-08-23 11:56:56Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
     
 !
614614         $get_parameter = '';
  615615         $hidden_parameter = '';
  616616         if (!empty($parameters)) {
<> 617 -          $parameters = explode('&amp;', $parameters);
   617+          $parameters = explode('&', $parameters);
618618           foreach ($parameters as $parameter) {
  619619             list($key, $value) = explode('=', $parameter);
  620620 
  621621             if ($key != $batch_keyword) {
<> 622 -              $get_parameter .= $key . '=' . $value . '&amp;';
   622+              $get_parameter .= $key . '=' . $value . '&';
623623               $hidden_parameter .= osc_draw_hidden_field($key, $value);
  624624             }
  625625           }
  626626         }
  627627 
<> 628 -        $display_links = '<form action="' . tep_href_link(basename($_SERVER['PHP_SELF'])) . '" action="get">';
   628+        $display_links = '<form action="' . osc_href_link(basename($_SERVER['PHP_SELF'])) . '" action="get">';
629629 
  630630         if ($this->batch_number > 1) {
<> 631 -          $display_links .= '<a href="' . tep_href_link(basename($_SERVER['PHP_SELF']), $get_parameter . $batch_keyword . '=' . ($this->batch_number - 1)) . '" class="splitPageLink">' . $osC_Language->get('result_set_previous_page') . '</a>';
   631+          $display_links .= osc_link_object(osc_href_link(basename($_SERVER['PHP_SELF']), $get_parameter . $batch_keyword . '=' . ($this->batch_number - 1)), $osC_Language->get('result_set_previous_page'), 'class="splitPageLink"');
632632         } else {
  633633           $display_links .= $osC_Language->get('result_set_previous_page');
  634634         }
  635635 
  636636         $display_links .= '&nbsp;&nbsp;' . sprintf($osC_Language->get('result_set_current_page'), osc_draw_pull_down_menu($batch_keyword, $pages_array, $this->batch_number, 'onchange="this.form.submit();"'), $number_of_pages) . '&nbsp;&nbsp;';
  637637 
  638638         if (($this->batch_number < $number_of_pages) && ($number_of_pages != 1)) {
<> 639 -          $display_links .= '<a href="' . tep_href_link(basename($_SERVER['PHP_SELF']), $get_parameter . $batch_keyword . '=' . ($this->batch_number + 1)) . '" class="splitPageLink">' . $osC_Language->get('result_set_next_page') . '</a>';
   639+          $display_links .= osc_link_object(osc_href_link(basename($_SERVER['PHP_SELF']), $get_parameter . $batch_keyword . '=' . ($this->batch_number + 1)), $osC_Language->get('result_set_next_page'), 'class="splitPageLink"');
640640         } else {
  641641           $display_links .= $osC_Language->get('result_set_previous_page');
  642642         }
  643643 
<> 644 -//        if (SID) $display_links .= tep_draw_hidden_field(tep_session_name(), tep_session_id());
  645 -
  646 -        $display_links .= $hidden_parameter . '</form>';
   644+        $display_links .= $hidden_parameter . osc_draw_hidden_session_id_field() . '</form>';
<_ 647645       } else {
  648646         $display_links = sprintf($osC_Language->get('result_set_current_page'), 1, 1);
  649647       }