--- fast_gallerya/fast_gallery.module	2008-11-25 01:54:57.000000000 -0500
+++ fast_gallery/fast_gallery.module	2008-12-11 15:45:14.937500000 -0500
@@ -577,9 +577,9 @@ function theme_fast_gallery($ar_pics, $a
   $cache = FastGalleryCache::getInstance();
 
   // Retrieve the alias path, handling case where Clean URLs are disabled
-  $base_path = variable_get('fast_gallery_path_alias', 'fast_gallery');
+  $bpath = variable_get('fast_gallery_path_alias', 'fast_gallery');
   if (variable_get('clean_url', 0) == 0)
-    $base_path = str_replace('?q=', '', $base_path);
+    $bpath = str_replace('?q=', '', $bpath);
         
   // Get current URL path without the alias
   $ar_path = array_slice($ar_path, _fast_gallery_get_alias_count());
@@ -635,7 +635,7 @@ function theme_fast_gallery($ar_pics, $a
     if ($i == count($random_ar))
       $random_ar[$key] = '<strong>'.$caption.'</strong>';
     else
-      $random_ar[$key] = l($caption, str_replace(' ', '_', $base_path.'/'.utf8_decode($path)));
+      $random_ar[$key] = l($caption, str_replace(' ', '_', $bpath.'/'.utf8_decode($path)));
     ++$i;
   }
   // Implode that crumb
@@ -653,7 +653,7 @@ function theme_fast_gallery($ar_pics, $a
     }
     // Breadcrumb for all other paths
     else {
-      $breadcrumb = l($title, $base_path . '/').' &raquo; '.$breadcrumb;
+      $breadcrumb = l($title, $bpath . '/').' &raquo; '.$breadcrumb;
     }
   }
 
@@ -852,13 +852,13 @@ function theme_fast_gallery($ar_pics, $a
       if (variable_get('fast_gallery_display_folder', 0)) {
         if (file_exists(utf8_decode($thumbpath))) {
           $output .= l($caption.$folder_teaser,
-              $base_path .'/' . $folder_link, array (
+              $bpath .'/' . $folder_link, array (
                 'html' => TRUE,
                 'attributes' => array (
                   'class' => 'folderdescription textlink'))) . '\\';
         }
         else {
-          $output .= l($caption, $base_path .'/' . $folder_link, array (
+          $output .= l($caption, $bpath .'/' . $folder_link, array (
                 'html' => TRUE,
                 'attributes' => array (
                   'class' => 'folder'))) . '\\';
@@ -868,7 +868,7 @@ function theme_fast_gallery($ar_pics, $a
         // Get the themed thumb image of the folder
         if (file_exists($thumbpath)) {
           $img = theme('fast_gallery_thumb', utf8_encode($thumbpath), TRUE);
-          $link = l($img.$folder_teaser, $base_path .'/' .  $folder_link, array ('html' => TRUE, 'attributes' => array ('class' => 'folderdescription')));
+          $link = l($img.$folder_teaser, $bpath .'/' .  $folder_link, array ('html' => TRUE, 'attributes' => array ('class' => 'folderdescription')));
         }
         else {
           // Construct the custom thumbnail path
@@ -894,7 +894,7 @@ function theme_fast_gallery($ar_pics, $a
           }
 
           $img = theme('fast_gallery_thumb', $thumbpath, TRUE);
-          $link = l($img, $base_path .'/' . $folder_link, array ('html' => TRUE, 'attributes' => array ('class' => 'folder')));
+          $link = l($img, $bpath .'/' . $folder_link, array ('html' => TRUE, 'attributes' => array ('class' => 'folder')));
         }
 
         // Truncate it if it exceeds the set teaser length
@@ -993,16 +993,16 @@ function theme_fast_gallery_display_bloc
   $img = theme('fast_gallery_thumb', $pic->path);
 
   // Get the base path based on whether Clean URLs are enabled
-  $base_path = variable_get('fast_gallery_path_alias', 'fast_gallery');
+  $bpath = variable_get('fast_gallery_path_alias', 'fast_gallery');
   if (variable_get('clean_url', 0) == 0)
-    $base_path = str_replace('?q=', '', $base_path);
-  $base_path = drupal_urlencode($base_path);
+    $bpath = str_replace('?q=', '', $bpath);
+  $bpath = drupal_urlencode($bpath);
 
   // Get the folder path
   $path_ar = explode('/', $pic->path);
   $abs_path = explode('/', variable_get('fast_gallery_path', ''));
   $path_ar = array_slice($path_ar, count($abs_path)-1, -1);
-  $random_img_path = str_replace(' ', '_', $base_path . '/' . implode('/', $path_ar));
+  $random_img_path = str_replace(' ', '_', $bpath . '/' . implode('/', $path_ar));
 
   $random_img_path = drupal_urlencode(utf8_decode($random_img_path));
   // Handle case where Clean URLs are disabled