Merge branch 'master' of github.com:samargulies/galleria-galleria

git-svn-id: http://svn.wp-plugins.org/galleria-galleria/trunk@368028 b8457f37-d9ea-0310-8a92-e5e31aec5664

galleria-galleria.php

@@ -3,7 +3,7 @@
 Plugin Name: Galleria Galleria
 Plugin URI: 
 Description: Transform standard WordPress galleries into galleria slideshows.
-Version: 0.1
+Version: 0.1.1
 Author: Sam Margulies
 Author URI: 
 License: GPL
@@ -448,12 +448,14 @@ function galleria_galleria_shortcode($attr) {
 		$style = "style='height:{$height}px;'";
 	}
 
-	echo "<div class='galleria-gallery' $style>";
-	echo gallery_shortcode($attr);
-	echo '</div><!-- end .galleria-gallery -->';
+	$content = "<div class='galleria-gallery' $style>";
+	$content .= gallery_shortcode($attr);
+	$content .= '</div><!-- end .galleria-gallery -->';
 
 	//remove our action to avoid changing this behavior for others
 	remove_action('wp_get_attachment_link', 'galleria_galleria_get_attachment_link', 2, 6);
+
+	return $content;
 }
 
 function galleria_galleria_get_attachment_link($content, $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false) {

readme.txt

@@ -4,7 +4,7 @@ Donate link: https://github.com/samargulies/galleria-galleria/
 Tags: photo, photos, gallery, galleries, photo gallery, lightbox 
 Requires at least: 3.0
 Tested up to: 3.1
-Stable tag: 0.1
+Stable tag: 0.1.1
 
 Transform standard WordPress galleries into galleria slideshows. 
 
@@ -32,5 +32,8 @@ This plugin uses the standard [gallery] shortcode to create slideshows. It also
 
 == Changelog ==
 
+= Version 0.1.1 =
+Display gallery where it is embedded instead of at the top of the post.
+
 = Version 0.1 =
 Initial commit