Quick Search:

Mode

Context

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

Other Diffs

Ignore

Blank Lines Whitespace:

Diff

345
 
377
 
377
 
category_tree.php
_> 11 <?php
  22 /*
<> 3 -  $Id: category_tree.php 345 2005-12-10 10:58:35Z hpdl $
   3+  $Id: category_tree.php 377 2006-01-09 14:47:49Z hpdl $
44 
  55   osCommerce, Open Source E-Commerce Solutions
  66   http://www.oscommerce.com
     
 !
3535         $category_product_count_end_string = ')';
  3636 
  3737     function osC_CategoryTree($load_from_database = true) {
<> 38 -      global $osC_Database, $osC_Cache;
   38+      global $osC_Database, $osC_Cache, $osC_Language;
3939 
  4040       if (SERVICES_CATEGORY_PATH_CALCULATE_PRODUCT_COUNT == '1') {
  4141         $this->show_category_product_count = true;
  4242       }
  4343 
  4444       if ($load_from_database === true) {
<> 45 -        if ($osC_Cache->read('category_tree-' . $_SESSION['language'], 720)) {
   45+        if ($osC_Cache->read('category_tree-' . $osC_Language->getCode(), 720)) {
4646           $this->data = $osC_Cache->getCache();
  4747         } else {
  4848           $Qcategories = $osC_Database->query('select c.categories_id, c.parent_id, c.categories_image, cd.categories_name from :table_categories c, :table_categories_description cd where c.categories_id = cd.categories_id and cd.language_id = :language_id order by c.parent_id, c.sort_order, cd.categories_name');
  4949           $Qcategories->bindTable(':table_categories', TABLE_CATEGORIES);
  5050           $Qcategories->bindTable(':table_categories_description', TABLE_CATEGORIES_DESCRIPTION);
<> 51 -          $Qcategories->bindInt(':language_id', $_SESSION['languages_id']);
   51+          $Qcategories->bindInt(':language_id', $osC_Language->getID());
<_ 5252           $Qcategories->execute();
  5353 
  5454           $this->data = array();