--- /home/pieter/public_html/drupal/sites/all/modules/emfield/contrib/emimage/providers/picasa.inc	2009-01-13 22:43:44.000000000 +0100
+++ /home/pieter/Software/Web/Drupal/Modules/emfield/contrib/emimage/providers/picasa.inc	2008-10-08 19:39:09.000000000 +0200
@@ -54,12 +54,6 @@ function emimage_picasa_data($field, $it
       'album' => $matches[2],
       'photoid' => $matches[3],
     );
-  }elseif(preg_match('!picasaweb\.google\.com/([^/]*)/([^/]*)\#(.*)!i', $item['embed'], $matches)){
-  	$data = array(
-      'userid' => $matches[1],
-      'album' => $matches[2],
-      'photoid' => $matches[3],
-    );
   }
   // use the page id, since we'll have that in most cases (except in embed pastes, which gets parsed during extraction)
   // we use this to get an rss feed w/ all the info for the image. interesting reading ;)
@@ -78,12 +72,8 @@ function emimage_picasa_data($field, $it
 
 function emimage_picasa_extract($embed = '') {
   // http://picasaweb.google.com/kaos777/YearlyKos/photo#5119063656501095090
-  // http://picasaweb.google.com/kaos777/YearlyKos#5119063656501095090
-
   if (preg_match('!picasaweb\.google\.com/([^/]*)/([^/]*)/photo\#(.*)!i', $embed, $matches)) {
     return $matches[3];
-  }elseif(preg_match('!picasaweb\.google\.com/([^/]*)/([^/]*)\#(.*)!i', $embed, $matches)){
-  	return $matches[3];
   }
 
   return array();
@@ -102,7 +92,7 @@ function emimage_picasa_embedded_link($c
   $album= $data['album'];
   $photoid= $data['photoid'];
 
-  return "http://picasaweb.google.com/$userid/$album#$photoid";
+  return "http://picasaweb.google.com/$userid/$album/photo#$photoid";
 }
 
 /**