Changeset 1492156
- Timestamp:
- 09/08/2016 01:47:02 AM (10 years ago)
- Location:
- ithemes-exchange
- Files:
-
- 10 edited
- 1 copied
-
tags/1.35.10.2 (copied) (copied from ithemes-exchange/trunk)
-
tags/1.35.10.2/history.txt (modified) (1 diff)
-
tags/1.35.10.2/init.php (modified) (2 diffs)
-
tags/1.35.10.2/lang/ithemes-exchange.pot (modified) (4 diffs)
-
tags/1.35.10.2/lib/super-widget/class.super-widget.php (modified) (5 diffs)
-
tags/1.35.10.2/readme.txt (modified) (2 diffs)
-
trunk/history.txt (modified) (1 diff)
-
trunk/init.php (modified) (2 diffs)
-
trunk/lang/ithemes-exchange.pot (modified) (4 diffs)
-
trunk/lib/super-widget/class.super-widget.php (modified) (5 diffs)
-
trunk/readme.txt (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
ithemes-exchange/tags/1.35.10.2/history.txt
r1489137 r1492156 1304 1304 1.35.10.1 - Elise Alley, Timothy Jacobs 1305 1305 Fix: Issue with the Super Widget not rendering when 'the_content' is applied before the main content area. 1306 1.35.10.2 - Elise Alley, Timothy Jacobs 1307 Fix: Issue with the Super Widget not rendering. Improve detection of "loop_start" -
ithemes-exchange/tags/1.35.10.2/init.php
r1489137 r1492156 2 2 /* 3 3 * Plugin Name: iThemes Exchange 4 * Version: 1.35.10. 14 * Version: 1.35.10.2 5 5 * Text Domain: it-l10n-ithemes-exchange 6 6 * Description: Easily sell your digital goods with iThemes Exchange, simple ecommerce for WordPress … … 25 25 class IT_Exchange { 26 26 27 var $_version = '1.35.10. 1';27 var $_version = '1.35.10.2'; 28 28 var $_wp_minimum = '3.5'; 29 29 var $_slug = 'ithemes-exchange'; -
ithemes-exchange/tags/1.35.10.2/lang/ithemes-exchange.pot
r1489137 r1492156 3 3 msgid "" 4 4 msgstr "" 5 "Project-Id-Version: iThemes Exchange 1.35.10. 1\n"5 "Project-Id-Version: iThemes Exchange 1.35.10.2\n" 6 6 "Report-Msgid-Bugs-To: http://ithemes.com/support/\n" 7 "POT-Creation-Date: 2016-09-0 2 19:48:04+00:00\n"7 "POT-Creation-Date: 2016-09-07 20:14:34+00:00\n" 8 8 "PO-Revision-Date: 2016-MO-DA HO:MI+ZONE\n" 9 9 "MIME-Version: 1.0\n" … … 2884 2884 msgstr "" 2885 2885 2886 #. #-#-#-#-# ithemes-exchange.pot (iThemes Exchange 1.35.10. 1) #-#-#-#-#2886 #. #-#-#-#-# ithemes-exchange.pot (iThemes Exchange 1.35.10.2) #-#-#-#-# 2887 2887 #. Plugin Name of the plugin/theme 2888 2888 #: core-addons/admin/basic-reporting/init.php:21 … … 7254 7254 msgstr "" 7255 7255 7256 #: lib/super-widget/class.super-widget.php: 587256 #: lib/super-widget/class.super-widget.php:61 7257 7257 msgid "iThemes Exchange Super Widget" 7258 7258 msgstr "" 7259 7259 7260 #: lib/super-widget/class.super-widget.php:6 07260 #: lib/super-widget/class.super-widget.php:63 7261 7261 msgid "" 7262 7262 "Handles Buy Now, Add to Cart, Cart Summary, Registration, Log in, and " … … 7264 7264 msgstr "" 7265 7265 7266 #: lib/super-widget/class.super-widget.php:2 177266 #: lib/super-widget/class.super-widget.php:221 7267 7267 msgid "Processing" 7268 7268 msgstr "" 7269 7269 7270 #: lib/super-widget/class.super-widget.php:2 187270 #: lib/super-widget/class.super-widget.php:222 7271 7271 msgid "Processing... " 7272 7272 msgstr "" 7273 7273 7274 #: lib/super-widget/class.super-widget.php:27 47274 #: lib/super-widget/class.super-widget.php:278 7275 7275 msgid "There are no options for this widget." 7276 7276 msgstr "" -
ithemes-exchange/tags/1.35.10.2/lib/super-widget/class.super-widget.php
r1489137 r1492156 48 48 */ 49 49 private $rendered = false; 50 51 /** @var bool */ 52 private $did_loop_start = false; 50 53 51 54 /** … … 70 73 add_action( 'dynamic_sidebar_before', array( $this, 'maybe_remove_sw_from_sidebar' ) ); 71 74 add_action( 'dynamic_sidebar_after', array( $this, 'mark_out_of_sidebar' ) ); 75 add_action('loop_start', array( $this, 'mark_loop_did_start' ) ); 72 76 } 73 77 } … … 149 153 150 154 <?php if ( $remove_others ) : ?> 151 jQuery('.it-exchange-super-widget[data-might-remove="1"]').remove();155 jQuery('.it-exchange-super-widget[data-might-remove="1"]').remove(); 152 156 <?php endif; ?> 153 157 … … 239 243 } 240 244 241 if ( $this->in_sidebar || did_action( 'loop_start' )) {245 if ( $this->in_sidebar || $this->did_loop_start ) { 242 246 $this->rendered = true; 243 247 } … … 460 464 $this->in_sidebar = false; 461 465 } 466 467 /** 468 * Mark that the loop did start. 469 * 470 * @since 1.35.10.2 471 * 472 * @param \WP_Query $query 473 */ 474 public function mark_loop_did_start( WP_Query $query ) { 475 if ( $query->is_main_query() ) { 476 $this->did_loop_start = true; 477 } 478 } 462 479 } 463 480 -
ithemes-exchange/tags/1.35.10.2/readme.txt
r1489137 r1492156 4 4 Requires at least: 3.7 5 5 Tested up to: 4.6 6 Stable tag: 1.35.10. 16 Stable tag: 1.35.10.2 7 7 License: GPLv2 or later 8 8 … … 88 88 89 89 == Changelog == 90 91 = 1.35.10.2 = 92 * Fix: Issue with the Super Widget not rendering. Improve detection of "loop_start" 90 93 91 94 = 1.35.10.1 = -
ithemes-exchange/trunk/history.txt
r1489137 r1492156 1304 1304 1.35.10.1 - Elise Alley, Timothy Jacobs 1305 1305 Fix: Issue with the Super Widget not rendering when 'the_content' is applied before the main content area. 1306 1.35.10.2 - Elise Alley, Timothy Jacobs 1307 Fix: Issue with the Super Widget not rendering. Improve detection of "loop_start" -
ithemes-exchange/trunk/init.php
r1489137 r1492156 2 2 /* 3 3 * Plugin Name: iThemes Exchange 4 * Version: 1.35.10. 14 * Version: 1.35.10.2 5 5 * Text Domain: it-l10n-ithemes-exchange 6 6 * Description: Easily sell your digital goods with iThemes Exchange, simple ecommerce for WordPress … … 25 25 class IT_Exchange { 26 26 27 var $_version = '1.35.10. 1';27 var $_version = '1.35.10.2'; 28 28 var $_wp_minimum = '3.5'; 29 29 var $_slug = 'ithemes-exchange'; -
ithemes-exchange/trunk/lang/ithemes-exchange.pot
r1489137 r1492156 3 3 msgid "" 4 4 msgstr "" 5 "Project-Id-Version: iThemes Exchange 1.35.10. 1\n"5 "Project-Id-Version: iThemes Exchange 1.35.10.2\n" 6 6 "Report-Msgid-Bugs-To: http://ithemes.com/support/\n" 7 "POT-Creation-Date: 2016-09-0 2 19:48:04+00:00\n"7 "POT-Creation-Date: 2016-09-07 20:14:34+00:00\n" 8 8 "PO-Revision-Date: 2016-MO-DA HO:MI+ZONE\n" 9 9 "MIME-Version: 1.0\n" … … 2884 2884 msgstr "" 2885 2885 2886 #. #-#-#-#-# ithemes-exchange.pot (iThemes Exchange 1.35.10. 1) #-#-#-#-#2886 #. #-#-#-#-# ithemes-exchange.pot (iThemes Exchange 1.35.10.2) #-#-#-#-# 2887 2887 #. Plugin Name of the plugin/theme 2888 2888 #: core-addons/admin/basic-reporting/init.php:21 … … 7254 7254 msgstr "" 7255 7255 7256 #: lib/super-widget/class.super-widget.php: 587256 #: lib/super-widget/class.super-widget.php:61 7257 7257 msgid "iThemes Exchange Super Widget" 7258 7258 msgstr "" 7259 7259 7260 #: lib/super-widget/class.super-widget.php:6 07260 #: lib/super-widget/class.super-widget.php:63 7261 7261 msgid "" 7262 7262 "Handles Buy Now, Add to Cart, Cart Summary, Registration, Log in, and " … … 7264 7264 msgstr "" 7265 7265 7266 #: lib/super-widget/class.super-widget.php:2 177266 #: lib/super-widget/class.super-widget.php:221 7267 7267 msgid "Processing" 7268 7268 msgstr "" 7269 7269 7270 #: lib/super-widget/class.super-widget.php:2 187270 #: lib/super-widget/class.super-widget.php:222 7271 7271 msgid "Processing... " 7272 7272 msgstr "" 7273 7273 7274 #: lib/super-widget/class.super-widget.php:27 47274 #: lib/super-widget/class.super-widget.php:278 7275 7275 msgid "There are no options for this widget." 7276 7276 msgstr "" -
ithemes-exchange/trunk/lib/super-widget/class.super-widget.php
r1489137 r1492156 48 48 */ 49 49 private $rendered = false; 50 51 /** @var bool */ 52 private $did_loop_start = false; 50 53 51 54 /** … … 70 73 add_action( 'dynamic_sidebar_before', array( $this, 'maybe_remove_sw_from_sidebar' ) ); 71 74 add_action( 'dynamic_sidebar_after', array( $this, 'mark_out_of_sidebar' ) ); 75 add_action('loop_start', array( $this, 'mark_loop_did_start' ) ); 72 76 } 73 77 } … … 149 153 150 154 <?php if ( $remove_others ) : ?> 151 jQuery('.it-exchange-super-widget[data-might-remove="1"]').remove();155 jQuery('.it-exchange-super-widget[data-might-remove="1"]').remove(); 152 156 <?php endif; ?> 153 157 … … 239 243 } 240 244 241 if ( $this->in_sidebar || did_action( 'loop_start' )) {245 if ( $this->in_sidebar || $this->did_loop_start ) { 242 246 $this->rendered = true; 243 247 } … … 460 464 $this->in_sidebar = false; 461 465 } 466 467 /** 468 * Mark that the loop did start. 469 * 470 * @since 1.35.10.2 471 * 472 * @param \WP_Query $query 473 */ 474 public function mark_loop_did_start( WP_Query $query ) { 475 if ( $query->is_main_query() ) { 476 $this->did_loop_start = true; 477 } 478 } 462 479 } 463 480 -
ithemes-exchange/trunk/readme.txt
r1489137 r1492156 4 4 Requires at least: 3.7 5 5 Tested up to: 4.6 6 Stable tag: 1.35.10. 16 Stable tag: 1.35.10.2 7 7 License: GPLv2 or later 8 8 … … 88 88 89 89 == Changelog == 90 91 = 1.35.10.2 = 92 * Fix: Issue with the Super Widget not rendering. Improve detection of "loop_start" 90 93 91 94 = 1.35.10.1 =
Note: See TracChangeset
for help on using the changeset viewer.