Changeset 988288

Timestamp:

09/12/2014 01:56:24 PM (11 years ago)

Author:

fristopher

Message:

fixed bug with no tag in bacon mockup

Location:

bacon-ipsum/trunk

Files:

• class-bacon-ipsum.php (modified) (3 diffs)
• configs/bacon_mockup-configuration.php (modified) (1 diff)
• includes/element-bacon_mockup.php (modified) (1 diff)
• languages/bacon-ipsum.po (modified) (1 diff)
• plugincore.php (modified) (1 diff)
• readme.txt (modified) (1 diff)

bacon-ipsum/trunk/class-bacon-ipsum.php

@@ -20 +20 @@
      * @var     string
      */
-    const VERSION = '2.1';
+    const VERSION = '2.2';
     /**
      * @var      string
@@ -326 +326 @@
         if(!empty($post)){
             echo "<a id=\"bacon-ipsum-shortcodeinsert\" title=\"".__('Bacon Ipsum Shortcode Builder','bacon-ipsum')."\" style=\"padding-left: 0.4em;\" class=\"button bacon-ipsum-editor-button\" href=\"#inst\">\n";
-            echo "  <img src=\"". self::get_url( __FILE__ ) . "assets/images/icon.png\" alt=\"".__("Generate Bacon","bacon-ipsum")."\" style=\"padding:0 2px 1px;\" /> ".__('Bacon Ipsum', 'bacon-ipsum')."\n";
+            echo "  <img src=\"". self::get_url( __FILE__ ) . "assets/images/icon.png\" alt=\"".__("Insert Shortcode","bacon-ipsum")."\" style=\"padding:0 2px 1px;\" /> ".__('Bacon Ipsum', 'bacon-ipsum')."\n";
             echo "</a>\n";
         }
@@ -498 +498 @@
         echo "              </div>\r\n";
         echo "              <div class=\"bacon-ipsum-modal-footer\">\r\n";
-        echo "                  <button class=\"button button-primary button-large\" id=\"bacon-ipsum-insert-shortcode\">".__("Generate Bacon","bacon-ipsum")."</button>\r\n";
+        echo "                  <button class=\"button button-primary button-large\" id=\"bacon-ipsum-insert-shortcode\">".__("Insert Shortcode","bacon-ipsum")."</button>\r\n";
         echo "              </div>\r\n";
         echo "          </div>\r\n";

bacon-ipsum/trunk/configs/bacon_mockup-configuration.php

@@ -45 +45 @@
             'caption'   =>  __('Pick a Custom Image to Use','bacon-ipsum'),
             'type'      =>  'dropdown',
-            'default'   =>  'bacon||Bacon,bacon-eggs||Bacon and Eggs,bacon2||Bacon 2,beef||Beef,brisket||Brisket,corned-beef||Corned Beef,drumstick||Drumstick,drumstick2||Drum Stick 2,family-style-bbq||Family Style BBQ,flank-steak||Flank Steak,hamburger||Hamburger,pastrami||Pastrami,pork-ribs||Pork Ribs,pulled-pork||Pulled Pork,ribeye||Rib Eye,ribeye2||Rib Eye 2,ribeyes-and-bacon||Ribeye and Bacon,ribs-of-beef||Ribs of Beef,salami||Salami,sausage||Sausage,sausage2||Sausage 2,sirloin||Sirloin,wing-rib||Wing Rib,random||Random',
+            'default'   =>  '*none||None,bacon-eggs||Bacon and Eggs,bacon||Bacon,beef||Beef,brisket||Brisket,corned-beef||Corned Beef,drumstick||Drumstick,drumstick2||More Drum Stick,family-style-bbq||Family Style BBQ,flank-steak||Flank Steak,hamburger||Hamburger,pastrami||Pastrami,pork-ribs||Pork Ribs,pulled-pork||Pulled Pork,ribeye||Rib Eye,ribeye2||More Rib Eye,ribeyes-and-bacon||Ribeye and Bacon,ribs-of-beef||Ribs of Beef,salami||Salami,sausage||Sausage,sausage2||More Sausage,sirloin||Sirloin,wing-rib||Wing Rib,random||Random,bacon2||More Bacon',
         ),
     ),

bacon-ipsum/trunk/includes/element-bacon_mockup.php

@@ -1 +1 @@
 <?php
 
-$bacon_tag = $atts['tag'] ? $atts['tag'] : '';
+
+//$bacon_tag = $atts['tag'] ;
+
+$bacon_tag = ($atts['tag'] == "none") ? '' : $atts['tag'];
 
 ?>

bacon-ipsum/trunk/languages/bacon-ipsum.po

@@ -2 +2 @@
 msgstr ""
 "Project-Id-Version: Bacon Ipsum\n"
-"POT-Creation-Date: Fri, 12 Sep 2014 12:18:35 +0000\n"
-"PO-Revision-Date: Fri, 12 Sep 2014 12:18:35 +0000\n"
+"POT-Creation-Date: Fri, 12 Sep 2014 13:48:56 +0000\n"
+"PO-Revision-Date: Fri, 12 Sep 2014 13:48:56 +0000\n"
 "Last-Translator: Chris McCoy <[email protected]>\n"
 "Language-Team: \n"

bacon-ipsum/trunk/plugincore.php

@@ -11 +11 @@
  * Plugin URI:  http://github.com/chrismccoy/bacon-ipsum
  * Description: Bacon Ipsum Generator
- * Version:     2.1
+ * Version:     2.2
  * Author:      Chris McCoy
  * Author URI:  http://github.com/chrismccoy

bacon-ipsum/trunk/readme.txt

@@ -86 +86 @@
 == Changelog ==
 
+= 2.2 =
+* Fixed Bug When No Tag is Selected
+
 = 2.1 =
 * Added Tag Option to Bacon Mockup Shortcode