Changeset 13651
- Timestamp:
- Mar 20, 2012, 5:13:35 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/batch_manager_global.php
r13646 r13651 678 678 $del_deriv_map[$params->type] = l10n($params->type); 679 679 } 680 $gen_deriv_map = $del_deriv_map; 681 $del_deriv_map[IMG_CUSTOM] = l10n(IMG_CUSTOM); 680 682 $template->assign( 681 683 array( 682 684 'del_derivatives_types' => $del_deriv_map, 683 'generate_derivatives_types' => $ del_deriv_map,685 'generate_derivatives_types' => $gen_deriv_map, 684 686 ) 685 687 ); -
trunk/admin/include/functions.php
r13077 r13651 171 171 function delete_element_files($ids) 172 172 { 173 global $conf; 173 174 if (count($ids) == 0) 174 175 { … … 2278 2279 2279 2280 $pattern.='(_[a-zA-Z0-9]+)*\.[a-zA-Z0-9]{3,4}$#'; 2280 if ($contents = opendir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR))2281 if ($contents = @opendir(PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR)) 2281 2282 { 2282 2283 while (($node = readdir($contents)) !== false) -
trunk/admin/maintenance.php
r13074 r13651 160 160 $url_format = get_root_url().'admin.php?page=maintenance&action=%s&pwg_token='.get_pwg_token(); 161 161 162 $purge_urls[l10n(' all')] = sprintf($url_format, 'derivatives').'&type=all';162 $purge_urls[l10n('All')] = sprintf($url_format, 'derivatives').'&type=all'; 163 163 foreach(ImageStdParams::get_defined_type_map() as $params) 164 164 { 165 165 $purge_urls[ l10n($params->type) ] = sprintf($url_format, 'derivatives').'&type='.$params->type; 166 166 } 167 $purge_urls[ l10n(IMG_CUSTOM) ] = sprintf($url_format, 'derivatives').'&type='.IMG_CUSTOM; 167 168 168 169 $template->assign( -
trunk/i.php
r13527 r13651 241 241 { 242 242 $params = $page['derivative_params'] = parse_custom_params($deriv); 243 ImageStdParams::apply_global($params); 243 244 244 245 if ($params->sizing->ideal_size[0] < 20 or $params->sizing->ideal_size[1] < 20) -
trunk/language/en_UK/admin.lang.php
r13646 r13651 875 875 $lang['%u users have automatic permission because they belong to a granted group.'] = '%u users have automatic permission because they belong to a granted group.'; 876 876 $lang['include photos with lower privacy level'] = 'include photos with lower privacy level'; 877 $lang['custom']='Custom'; 877 878 ?>
Note: See TracChangeset
for help on using the changeset viewer.