--- fast_gallery.module 2008-10-28 10:03:24.000000000 -0400 +++ new_fast_gallery.module 2008-10-30 11:06:33.000000000 -0400 @@ -6,15 +6,15 @@ * Fast Gallery allows you to build galleries based on your file * system with folders and subfolders. * - * This module is sponsored by Schär Webdesign. + * This module is sponsored by Sch�r Webdesign. * Visit www.schaerwebdesign.ch or the Drupal-related blog www.rapsli.ch. * * This version is a rewrite of the version 6.x code. * This version written by Nicholas C. Yang - www.nyanginator.com. * - * Original version by Raphael Schär - www.schaerwebdesign.ch. + * Original version by Raphael Sch�r - www.schaerwebdesign.ch. * - * @author Raphael Schär - www.schaerwebdesign.ch + * @author Raphael Sch�r - www.schaerwebdesign.ch * @author Nicholas C. Yang - www.nyanginator.com */ @@ -237,7 +237,7 @@ function fast_gallery_menu() { /** * Page callback function from hook_menu */ -function fast_gallery_page() { +function fast_gallery_page($fg_path='', $gal_name='') { $path = drupal_get_path('module', 'fast_gallery'); include_once('fast_gallery.class.php'); @@ -248,7 +248,13 @@ function fast_gallery_page() { drupal_add_css($path . '/fast_gallery.css', 'module', 'all', FALSE); - $ar_path = arg(); + if ($fg_path == '' || $gal_name == '') { + $ar_path = arg(); + } + else + { + $ar_path = array($fg_path, $gal_name); + } // Handle base directory path if (count($ar_path) == _fast_gallery_get_alias_count()) { @@ -275,7 +281,7 @@ function fast_gallery_page() { return t('No pictures found. First set your ') . l('configuration', 'admin/settings/fast_gallery/general') . t(' and then click Rescan on the General settings page.'); } - return theme('fast_gallery', $ar_pics, arg(), $folder); + return theme('fast_gallery', $ar_pics, $ar_path, $folder); } /** @@ -532,7 +538,7 @@ function theme_fast_gallery($ar_pics, $a break; } else { - $breadcrumb .= l($value, $base_path .'/' . $path) . ' ' . htmlentities('»') . ' '; + $breadcrumb .= l($value, $base_path .'/' . $path) . ' ' . htmlentities('�') . ' '; } ++$i; }