Changeset 1250


Ignore:
Timestamp:
Apr 21, 2006, 11:16:37 PM (19 years ago)
Author:
nikrou
Message:

bug fixed: popuhelp (slash)
svn merge -r1248:1249 from branch-1_6 into trunk

Location:
trunk
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/cat_modify.php

    r1131 r1250  
    250250
    251251    'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'],
    252     'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_modify',
     252    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=cat_modify',
    253253
    254254    'F_ACTION' => $form_action,

  • trunk/admin/cat_perm.php

    r1072 r1250  
    213213        'admin.php?page=cat_modify&cat_id='
    214214        ),
    215     'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=cat_perm',
     215    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=cat_perm',
    216216    'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=cat_perm&cat='.$page['cat']
    217217    )

  • trunk/admin/configuration.php

    r1072 r1250  
    161161    'L_RESET'=>$lang['reset'],
    162162
    163     'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=configuration',
     163    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=configuration',
    164164
    165165    'F_ACTION'=>$action

  • trunk/admin/maintenance.php

    r1121 r1250  
    111111    'U_MAINT_FEEDS' => $start_url.'feeds',
    112112    'U_MAINT_DATABASE' => $start_url.'database',
    113     'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=maintenance',
     113    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=maintenance',
    114114    )
    115115  );

  • trunk/admin/site_manager.php

    r1107 r1250  
    205205
    206206$template->assign_vars( array(
    207   'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=remote_site',
     207  'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=remote_site',
    208208  'F_ACTION' => PHPWG_ROOT_PATH.'admin.php'
    209209                .get_query_string_diff( array('action','site') )

  • trunk/admin/site_update.php

    r1204 r1250  
    875875$template->assign_vars(
    876876  array(
    877     'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=synchronize'
     877    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=synchronize'
    878878    )
    879879  );

  • trunk/admin/user_list.php

    r1170 r1250  
    480480    'L_DELETE_HINT' => $lang['user_delete_hint'],
    481481
    482     'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=user_list',
     482    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=user_list',
    483483   
    484484    'F_ADD_ACTION' => $base_url,

  • trunk/search.php

    r1125 r1250  
    190190  'TODAY_YEAR' => date('Y', time()),
    191191  'S_SEARCH_ACTION' => 'search.php',
    192   'U_HELP' => PHPWG_ROOT_PATH.'/popuphelp.php?page=search',
     192  'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=search',
    193193  'U_HOME' => make_index_url(),
    194194
Note: See TracChangeset for help on using the changeset viewer.