Changeset 2069
- Timestamp:
- Jul 20, 2007, 1:39:43 AM (17 years ago)
- Location:
- branches/branch-1_7/include
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/branch-1_7/include/functions_category.inc.php
r1900 r2069 73 73 if (!$user['expand'] and !$filter['enabled']) 74 74 { 75 $query.= ' 76 WHERE 75 $where = ' 77 76 (id_uppercat is NULL'; 78 77 if (isset($page['category'])) 79 78 { 80 $ query.= ' OR id_uppercat IN ('.$page['category']['uppercats'].')';81 } 82 $ query.= ')';79 $where .= ' OR id_uppercat IN ('.$page['category']['uppercats'].')'; 80 } 81 $where .= ')'; 83 82 } 84 83 else 85 84 { 86 $ query.= '85 $where = ' 87 86 '.get_sql_condition_FandF 88 87 ( … … 91 90 'visible_categories' => 'id', 92 91 ), 93 'WHERE' 92 null, 93 true 94 94 ); 95 95 } 96 96 97 $where = trigger_event('get_categories_menu_sql_where', 98 $where, $user['expand'], $filter['enabled'] ); 99 97 100 $query.= ' 101 WHERE '.$where.' 98 102 ;'; 99 103 -
branches/branch-1_7/include/functions_html.inc.php
r2052 r2069 395 395 $ref_level = 0; 396 396 $level = 0; 397 $menu = ''; 397 398 $menu = trigger_event('get_html_menu_category', '', 399 $categories, $selected_category); 400 if (strlen($menu)) 401 { 402 return $menu; 403 } 398 404 399 405 foreach ($categories as $category) … … 438 444 ); 439 445 440 $menu.= "\n".'<a href="'.$url.'"';446 $menu.= '<a href="'.$url.'"'; 441 447 if ($selected_category!=null 442 448 and $category['id'] == $selected_category['id_uppercat']) … … 444 450 $menu.= ' rel="up"'; 445 451 } 446 $menu.= ' title=" 452 $menu.= ' title="'.$title.'">'.$category['name'].'</a>'; 447 453 448 454 if ( $category['count_images']>0 )
Note: See TracChangeset
for help on using the changeset viewer.