Changeset 1057061

Timestamp:

12/30/2014 07:24:06 PM (11 years ago)

Author:

ciaranm

Message:

Fixing issue where shortcode links were displaying above page text.

Location:

pocket-wp/trunk

Files:

• pocket-wp.php (modified) (4 diffs)
• readme.txt (modified) (2 diffs)
• screenshots/screenshot-1.png (added)
• screenshots/screenshot-2.png (added)
• screenshots/screenshot-3.png (added)
• screenshots/screenshot-4.png (added)
• screenshots/screenshot-5.png (added)

pocket-wp/trunk/pocket-wp.php

@@ -4 +4 @@
  * Plugin URI: http://ciaranmahoney.me/pocket-wp
  * Description: Adds a shortcode and widget which allows you to display your pocket links in a WordPress page/post.
- * Version: 0.3
+ * Version: 0.4
  * Author: Ciaran Mahoney
  * Author URI: http://ciaranmahoney.me/
@@ -30 +30 @@
 // Set the version of this plugin
 if( ! defined( 'POCKET_WP' ) ) {
-  define( 'POCKET_WP', '0.3' );
+  define( 'POCKET_WP', '0.4' );
 }
 
@@ -396 +396 @@
         // Loop through array and get link details.
         foreach($pwp_items as $item){
-            echo '<h3><a href="' . $item[0] . '" class="pwp_item_sc_link" target="_blank">' . $item[1] . '</a></h3>';
+            $html[] = '<div class="pwp-links-shortcode">';
+
+            $html[] = '<h4><a href="' . $item[0] . '" class="pwp_item_sc_link" target="_blank">' . $item[1] . '</a></h4>';
             
             //Display excerpt if excerpt is not set to no.  
             if (strtolower($excerpt) != 'no'){
-                echo '<p class="pwp_item_excerpt">' . $item[2] . '</p>';
+                $html[] = '<p class="pwp_item_excerpt">' . $item[2] . '</p>';
             }
 
             // Display tag list if tag_list not set to no.
             if(strtolower($tag_list) != 'no') {
-                echo '<p class="pwp_tag_list">';
+                $html[] = '<p class="pwp_tag_list">';
                 foreach($item[3] as $tag) {
-                    echo '<span class="pwp_tags">' . $tag['tag'] . '</span>';
+                    $html[] = '<span class="pwp_tags">' . $tag['tag'] . '</span>';
                 }
-                echo'</p>';
+                $html[] ='</p>';
              }
         }
@@ -415 +417 @@
         if (strtolower($credit) == "yes") {
             // Display author credit links
-            echo '<p id="pwp_plugin_credit_sc"><a href="http://ciaranmahoney.me/code/pocket-wp/?utm_campaign=pocket-wp&utm_source=pwp-shortcode&utm_medium=wp-plugins" target="_blank">Pocket WP</a> by <a href="https://twitter.com/ciaransm" target="_blank">@ciaransm</a></p>';
+            $html[] = '<p id="pwp_plugin_credit_sc"><a href="http://ciaranmahoney.me/code/pocket-wp/?utm_campaign=pocket-wp&utm_source=pwp-shortcode&utm_medium=wp-plugins" target="_blank">Pocket WP</a> by <a href="https://twitter.com/ciaransm" target="_blank">@ciaransm</a></p>';
         } else { 
             // Do not show credit links unless user opts in.
         }
+
+        return implode("\n", $html);
+
     } // end pwp_shortcode
 } // end pocketwp class

pocket-wp/trunk/readme.txt

@@ -3 +3 @@
 Tags: links, pocket, shortcode, widget
 Requires at least: 3.0.1
-Tested up to: 3.4
+Tested up to: 4.1
 Stable tag: trunk
 License: GPLv2 or later
@@ -71 +71 @@
 == Changelog ==
 
+= 0.4 =
+* Fix so shortcode doesn't always display above text.
+
 = 0.3 =
 * First public release