Merge branch '6.x' of https://github.com/Islandora/islandora into 6.x

ObjectHelper.inc

@@ -336,11 +336,12 @@ class ObjectHelper {
       $versions = $item->get_datastream_history($id);
       if (is_array($versions)) {
         $downloadVersion = '<form method="GET" action="' . $action . '" onsubmit="this.action=\'' . $action . '\' + \'/\'+this.version.value;">';
+        $downloadVersion .= '<input type="submit" value="' . t('Download') . '">';
         $downloadVersion .= '<select name="version">';
         foreach ($versions as $version) {
           $downloadVersion .= '<option>' . $version->createDate . '</option>';
         }
-        $downloadVersion .= '</select><input type="submit" value="' . t('Download') . '"></form>';
+        $downloadVersion .= '</select></form>';
       }
     }
 

fedora_repository.info

@@ -1,9 +1,8 @@
-; $Id$
 name = Islandora Repository
 dependencies[] = imageapi
 dependencies[] = tabs
 dependencies[] = islandora_content_model_forms
 description = Shows a list of items in a fedora collection.
 package = Islandora
-version = 11.3beta1
+version = 11.3beta2
 core = 6.x

plugins/fedora_imageapi.info

@@ -3,5 +3,5 @@ description = Adds image manipulation support through a REST interface
 package = Islandora Dependencies
 dependencies[] = fedora_repository
 dependencies[] = imageapi
-version = 11.3beta1
+version = 11.3beta2
 core = 6.x