Index: /extensions/GThumb/main.inc.php
===================================================================
--- /extensions/GThumb/main.inc.php	(revision 12678)
+++ /extensions/GThumb/main.inc.php	(revision 12705)
@@ -19,4 +19,5 @@
 
 add_event_handler('loc_begin_index', 'GThumb_init', 60);
+add_event_handler('loc_end_index_thumbnails', 'process_GThumb', 50, 2);
 add_event_handler('ws_add_methods', 'add_gthumb_thumbnails_method');
 add_event_handler('get_admin_plugin_menu_links', 'GThumb_admin_menu');
@@ -31,6 +32,4 @@
   $page['nb_image_page'] = $conf['GThumb']['nb_image_page'];
 
-  add_event_handler('loc_end_index_thumbnails', 'process_GThumb', 50, 2);
-
   if (is_dir(GTHUMB_CACHE_DIR) and !is_dir(GTHUMB_CACHE_DIR.'/'.$conf['GThumb']['height']))
   {
@@ -44,4 +43,9 @@
 {
   global $template, $conf;
+
+  if (isset($_GET['rvts']))
+  {
+    $conf['GThumb']['big_thumb'] = false;
+  }
 
   $template->set_filename( 'index_thumbnails', realpath(GTHUMB_PATH.'template/gthumb.tpl'));
@@ -137,5 +141,5 @@
 
   $new_height = $size == 'small' ? $conf['GThumb']['height'] : $conf['GThumb']['height'] * 2 + $conf['GThumb']['margin'];
-  $file = GTHUMB_CACHE_DIR.'/'.$new_height.'/'.md5($picture['path']).'.'.$picture['tn_ext'];
+  $file = GTHUMB_CACHE_DIR.'/'.$new_height.'/'.md5($picture['path'].(!empty($picture['md5sum']) ? $picture['md5sum'] : '')).'.'.$picture['tn_ext'];
 
   if (file_exists($file))
Index: /extensions/GThumb/functions.inc.php
===================================================================
--- /extensions/GThumb/functions.inc.php	(revision 12691)
+++ /extensions/GThumb/functions.inc.php	(revision 12705)
@@ -46,5 +46,5 @@
       $cache_dir = $data['cache_path'];
     }
-    $file = $cache_dir.'/'.md5($picture['path']).'.'.$picture['tn_ext'];
+    $file = $cache_dir.'/'.md5($picture['path'].(!empty($picture['md5sum']) ? $picture['md5sum'] : '')).'.'.$picture['tn_ext'];
 
     if (!is_dir($cache_dir))
Index: /extensions/GThumb/template/gthumb.tpl
===================================================================
--- /extensions/GThumb/template/gthumb.tpl	(revision 12696)
+++ /extensions/GThumb/template/gthumb.tpl	(revision 12705)
@@ -25,4 +25,5 @@
 
 GThumb.build('#thumbnails');
+$(window).bind('RVTS_loaded', function() {ldelim} GThumb.build('#thumbnails'); });
 {/footer_script}
 
Index: /extensions/GThumb/js/gthumb.js
===================================================================
--- /extensions/GThumb/js/gthumb.js	(revision 12696)
+++ /extensions/GThumb/js/gthumb.js	(revision 12705)
@@ -19,6 +19,7 @@
   build: function (selector) {
 
+    this.t = new Array;
     this.selector = selector;
-    jQuery(selector+' img').each(function() {
+    jQuery(selector+' img.thumbnail').each(function() {
       id = parseInt(this.id.substring(2));
       width = parseInt(jQuery(this).attr('width'));
Index: /extensions/GThumb/maintain.inc.php
===================================================================
--- /extensions/GThumb/maintain.inc.php	(revision 12678)
+++ /extensions/GThumb/maintain.inc.php	(revision 12705)
@@ -22,3 +22,12 @@
 }
 
+function plugin_activate($plugin_id, $version)
+{
+  if (in_array($version, array('2.3.a', '2.3.b')))
+  {
+    include_once(PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/functions.inc.php');
+    gtdeltree(PHPWG_ROOT_PATH.PWG_LOCAL_DIR.'GThumb');
+  }
+}
+
 ?>