Changeset 869


Ignore:
Timestamp:
09/19/05 00:29:17 (15 years ago)
Author:
plg
Message:
  • bug 111 fixed: "Can't add virtual category when cookie disabled". Correction reported from branch 1.4.
  • bug 109 fixed : "disabled "best rated" menu item when rating is not enabled". Correction reported from branch 1.4.
  • bug 95 fixed : "default maxwidth and maxheight not registered". Correction reported from branch 1.4.
Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/cat_list.php

    r863 r869  
    239239  'CATEGORIES_NAV'=>$navigation, 
    240240  'NEXT_RANK'=>$next_rank, 
    241   'F_ACTION'=>$form_action, 
     241  'F_ACTION'=>add_session_id($form_action), 
    242242   
    243243  'L_ADD_VIRTUAL'=>$lang['cat_add'], 
  • trunk/admin/configuration.php

    r858 r869  
    8383        array_push($page['errors'], $lang['periods_error']); 
    8484      } 
     85      // maxwidth 
     86      if (isset($_POST['default_maxwidth']) 
     87          and !empty($_POST['default_maxwidth']) 
     88          and (!preg_match($int_pattern, $_POST['default_maxwidth']) 
     89               or $_POST['default_maxwidth'] < 50)) 
     90      { 
     91        array_push($page['errors'], $lang['maxwidth_error']); 
     92      } 
     93      // maxheight 
     94      if (isset($_POST['default_maxheight']) 
     95          and !empty($_POST['default_maxheight']) 
     96          and (!preg_match($int_pattern, $_POST['default_maxheight']) 
     97               or $_POST['default_maxheight'] < 50)) 
     98      { 
     99        array_push($page['errors'], $lang['maxheight_error']); 
     100      } 
    85101      break; 
    86102    } 
     
    90106  if (count($page['errors']) == 0) 
    91107  { 
    92     echo '<pre>'; print_r($_POST); echo '</pre>'; 
     108//    echo '<pre>'; print_r($_POST); echo '</pre>'; 
    93109    $result = pwg_query('SELECT * FROM '.CONFIG_TABLE); 
    94110    while ($row = mysql_fetch_array($result)) 
     
    177193        'CONF_RECENT'=>$conf['recent_period'], 
    178194        'NB_COMMENTS_PAGE'=>$conf['nb_comment_page'], 
     195        'MAXWIDTH'=>$conf['default_maxwidth'], 
     196        'MAXHEIGHT'=>$conf['default_maxheight'], 
    179197        'EXPAND_YES'=>$expand_yes, 
    180198        'EXPAND_NO'=>$expand_no, 
  • trunk/category.php

    r858 r869  
    215215    )); 
    216216// best rated 
    217 $template->assign_block_vars( 
    218   'special_cat', 
    219   array( 
    220     'URL' => add_session_id(PHPWG_ROOT_PATH.'category.php?cat=best_rated'), 
    221     'TITLE' => $lang['best_rated_cat_hint'], 
    222     'NAME' => $lang['best_rated_cat'] 
    223     )); 
     217if ($conf['rate']) 
     218{ 
     219  $template->assign_block_vars( 
     220    'special_cat', 
     221    array( 
     222      'URL' => add_session_id(PHPWG_ROOT_PATH.'category.php?cat=best_rated'), 
     223      'TITLE' => $lang['best_rated_cat_hint'], 
     224      'NAME' => $lang['best_rated_cat'] 
     225      ) 
     226    ); 
     227} 
    224228// random 
    225229$template->assign_block_vars( 
  • trunk/doc/ChangeLog

    r868 r869  
     12005-09-18 Pierrick LE GALL 
     2 
     3        * bug 111 fixed: "Can't add virtual category when cookie 
     4        disabled". Correction reported from branch 1.4. 
     5 
     6        * bug 109 fixed : "disabled "best rated" menu item when rating is 
     7        not enabled". Correction reported from branch 1.4. 
     8 
     9        * bug 95 fixed : "default maxwidth and maxheight not registered 
     10        ". Correction reported from branch 1.4. 
     11 
    1122005-09-18 Pierrick LE GALL 
    213 
Note: See TracChangeset for help on using the changeset viewer.