Changeset 5691


Ignore:
Timestamp:
04/06/10 22:04:42 (9 years ago)
Author:
rvelices
Message:

fixes only:

  • some searches returned bad array for pageitems (resulting in php warnings and sometimes mysql fatal error) still existing in branch 2.0
  • mysql fatal error in admin maintenance
  • php warn in plugins_list.php
  • fix check on function param in admin/include/functions.php
Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/include/functions.php

    r5528 r5691  
    248248    update_category($category_ids); 
    249249  } 
    250    
     250 
    251251  trigger_action('delete_elements', $ids); 
    252252} 
     
    921921    $query = ' 
    922922UPDATE '.IMAGES_TABLE.' 
    923   SET path = '.pwg_db_concat(array($fulldirs[$cat_id],'\'/\'','file')).' 
     923  SET path = '.pwg_db_concat(array("'".$fulldirs[$cat_id]."/'",'file')).' 
    924924  WHERE storage_category_id = '.$cat_id.' 
    925925;'; 
     
    12931293function add_tags($tags, $images) 
    12941294{ 
    1295   if (count($tags) == 0 or count($tags) == 0) 
     1295  if (count($tags) == 0 or count($images) == 0) 
    12961296  { 
    12971297    return; 
     
    19041904    } 
    19051905  } 
    1906    
     1906 
    19071907  switch ($menu_page) 
    19081908  { 
     
    19241924    case 'permalinks': 
    19251925      return 1; 
    1926        
     1926 
    19271927    case 'user_list': 
    19281928    case 'user_perm': 
     
    19371937    case 'plugin': 
    19381938      return 3; 
    1939        
     1939 
    19401940    case 'stats': 
    19411941    case 'history': 
     
    19721972      ); 
    19731973  } 
    1974    
     1974 
    19751975  return $taglist; 
    19761976} 
     
    19841984 
    19851985  $tag_ids = array(); 
    1986    
     1986 
    19871987  foreach ($raw_tags as $raw_tag) 
    19881988  { 
     
    19951995      // we have to create a new tag 
    19961996      array_push( 
    1997         $tag_ids,  
     1997        $tag_ids, 
    19981998        tag_id_from_tag_name($raw_tag) 
    19991999        ); 
  • trunk/admin/plugins_list.php

    r5475 r5691  
    4040{ 
    4141  check_pwg_token(); 
    42    
     42 
    4343  $page['errors'] = $plugins->perform_action($_GET['action'], $_GET['plugin']); 
    4444 
     
    7070    'DESC' => $fs_plugin['description'], 
    7171    'AUTHOR' => $fs_plugin['author'], 
    72     'AUTHOR_URL' => $fs_plugin['author uri'], 
     72    'AUTHOR_URL' => @$fs_plugin['author uri'], 
    7373    'U_ACTION' => sprintf($action_url, $plugin_id) 
    7474    ); 
     
    113113  $template->append('plugin_states', 'missing'); 
    114114} 
    115    
     115 
    116116$template->assign_var_from_handle('ADMIN_CONTENT', 'plugins'); 
    117117?> 
  • trunk/include/functions_search.inc.php

    r5196 r5691  
    253253        else 
    254254        { 
    255           $items = array_intersect($items, $tag_items); 
     255          $items = array_values( array_intersect($items, $tag_items) ); 
    256256        } 
    257257        break; 
Note: See TracChangeset for help on using the changeset viewer.