Changeset 368028

Timestamp:

04/01/2011 08:19:18 PM (15 years ago)

Author:

gluten

Message:

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

Location:

galleria-galleria/trunk

Files:

• galleria-galleria.php (modified) (2 diffs)
• readme.txt (modified) (2 diffs)

galleria-galleria/trunk/galleria-galleria.php

@@ -4 +4 @@
 Plugin URI: 
 Description: Transform standard WordPress galleries into galleria slideshows.
-Version: 0.1
+Version: 0.1.1
 Author: Sam Margulies
 Author URI: 
@@ -449 +449 @@
     }
     
-    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;
 }
 

galleria-galleria/trunk/readme.txt

@@ -5 +5 @@
 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. 
@@ -33 +33 @@
 == Changelog ==
 
+= Version 0.1.1 =
+Display gallery where it is embedded instead of at the top of the post.
+
 = Version 0.1 =
 Initial commit