Collapse-O-Matic - Version 1.6.6

Version Description

  • added filter attribute to pass the content through the_content filter
  • changed name of wpex_clean_shortcodes function
  • tested up to: WordPress 4.2-alpha-31047
Download this release

Release Info

Developer baden03
Plugin Icon 128x128 Collapse-O-Matic
Version 1.6.6
Comparing to
See all releases

Code changes from version 1.6.5 to 1.6.6

Files changed (3) hide show
  1. collapse-o-matic.php +11 -6
  2. light_style.css +2 -2
  3. readme.txt +16 -1
collapse-o-matic.php CHANGED
@@ -5,7 +5,7 @@ Text Domain: colomat
5
  Domain Path: /languages
6
  Plugin URI: http://plugins.twinpictures.de/plugins/collapse-o-matic/
7
  Description: Collapse-O-Matic adds an [expand] shortcode that wraps content into a lovely, jQuery collapsible div.
8
- Version: 1.6.5
9
  Author: twinpictures, baden03
10
  Author URI: http://twinpictures.de/
11
  License: GPL2
@@ -30,7 +30,7 @@ class WP_Collapse_O_Matic {
30
  * Current version
31
  * @var string
32
  */
33
- var $version = '1.6.5';
34
 
35
  /**
36
  * Used as prefix for options entry
@@ -195,6 +195,7 @@ class WP_Collapse_O_Matic {
195
  'endwrap' => '',
196
  'elwraptag' => '',
197
  'elwrapclass' => '',
 
198
  'tabindex' => $options['tabindex']
199
  ), $atts));
200
 
@@ -236,6 +237,10 @@ class WP_Collapse_O_Matic {
236
  }
237
  wp_reset_postdata();
238
  }
 
 
 
 
239
 
240
  $ewo = '';
241
  $ewc = '';
@@ -279,7 +284,7 @@ class WP_Collapse_O_Matic {
279
  $inline_class = 'colomat-inline ';
280
  $collapse_class = 'collapseomatic_content_inline ';
281
  }
282
- $eDiv = '<'.$targtag.' id="target-'.$id.'" class="'.$collapse_class.$inline_class.$targclass.'">'.do_shortcode($content).'</'.$targtag.'>';
283
  }
284
 
285
  if($excerpt){
@@ -765,8 +770,8 @@ $WP_Collapse_O_Matic = new WP_Collapse_O_Matic;
765
 
766
  //clean unwanted p and br tags from shortcodes
767
  //http://www.wpexplorer.com/clean-up-wordpress-shortcode-formatting
768
- if (!function_exists('wpex_clean_shortcodes')) {
769
- function wpex_clean_shortcodes($content){
770
  $array = array (
771
  '<p>[' => '[',
772
  ']</p>' => ']',
@@ -775,7 +780,7 @@ if (!function_exists('wpex_clean_shortcodes')) {
775
  $content = strtr($content, $array);
776
  return $content;
777
  }
778
- add_filter('the_content', 'wpex_clean_shortcodes');
779
  }
780
 
781
  ?>
5
  Domain Path: /languages
6
  Plugin URI: http://plugins.twinpictures.de/plugins/collapse-o-matic/
7
  Description: Collapse-O-Matic adds an [expand] shortcode that wraps content into a lovely, jQuery collapsible div.
8
+ Version: 1.6.6
9
  Author: twinpictures, baden03
10
  Author URI: http://twinpictures.de/
11
  License: GPL2
30
  * Current version
31
  * @var string
32
  */
33
+ var $version = '1.6.6';
34
 
35
  /**
36
  * Used as prefix for options entry
195
  'endwrap' => '',
196
  'elwraptag' => '',
197
  'elwrapclass' => '',
198
+ 'filter' => 'true',
199
  'tabindex' => $options['tabindex']
200
  ), $atts));
201
 
237
  }
238
  wp_reset_postdata();
239
  }
240
+ else if(!empty($filter)){
241
+ $content = apply_filters( 'the_content', $content );
242
+ $content = str_replace( ']]>', ']]&gt;', $content );
243
+ }
244
 
245
  $ewo = '';
246
  $ewc = '';
284
  $inline_class = 'colomat-inline ';
285
  $collapse_class = 'collapseomatic_content_inline ';
286
  }
287
+ $eDiv = '<'.$targtag.' id="target-'.$id.'" class="'.$collapse_class.$inline_class.$targclass.'">'.$content.'</'.$targtag.'>';
288
  }
289
 
290
  if($excerpt){
770
 
771
  //clean unwanted p and br tags from shortcodes
772
  //http://www.wpexplorer.com/clean-up-wordpress-shortcode-formatting
773
+ if (!function_exists('tp_clean_shortcodes')) {
774
+ function tp_clean_shortcodes($content){
775
  $array = array (
776
  '<p>[' => '[',
777
  ']</p>' => ']',
780
  $content = strtr($content, $array);
781
  return $content;
782
  }
783
+ add_filter('the_content', 'tp_clean_shortcodes');
784
  }
785
 
786
  ?>
light_style.css CHANGED
@@ -1,5 +1,5 @@
1
  .collapseomatic {
2
- background-image: url(images/arrow-down.png);
3
  background-repeat: no-repeat;
4
  padding: 0 0 10px 16px;
5
  cursor: pointer;
@@ -16,7 +16,7 @@
16
  text-decoration: underline;
17
  }
18
  .colomat-close {
19
- background-image: url(images/arrow-up.png);
20
  }
21
  .colomat-swap {
22
  display: none;
1
  .collapseomatic {
2
+ background-image: url('images/arrow-down.png');
3
  background-repeat: no-repeat;
4
  padding: 0 0 10px 16px;
5
  cursor: pointer;
16
  text-decoration: underline;
17
  }
18
  .colomat-close {
19
+ background-image: url('images/arrow-up.png');
20
  }
21
  .colomat-swap {
22
  display: none;
readme.txt CHANGED
@@ -5,7 +5,7 @@ Donate link: http://plugins.twinpictures.de/plugins/collapse-o-matic/
5
  Tags: collapse, expand, collapsible, expandable, expandable content, collapsable content, shortcode, hidden, hide, display, accordion, accordion, jQuery, javascript, roll-your-own, twinpictures, read me, read more, more, plugin oven
6
  Requires at least: 3.9
7
  Tested up to: 4.2
8
- Stable tag: 1.6.5
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
@@ -50,6 +50,11 @@ No. Not even close.
50
 
51
  == Changelog ==
52
 
 
 
 
 
 
53
  = 1.6.5 =
54
  * maptastic class only removed when present
55
  * maptastic has a max-width assigned to prevent content from entering display area.
@@ -274,6 +279,16 @@ Fixed auto-expand of urls with id-anchors
274
 
275
  == Upgrade Notice ==
276
 
 
 
 
 
 
 
 
 
 
 
277
  = 1.6.4 =
278
  * added plugin to GitHub: https://github.com/baden03/collapse-o-matic
279
  * added new tabindex attribute to shortcode and options page
5
  Tags: collapse, expand, collapsible, expandable, expandable content, collapsable content, shortcode, hidden, hide, display, accordion, accordion, jQuery, javascript, roll-your-own, twinpictures, read me, read more, more, plugin oven
6
  Requires at least: 3.9
7
  Tested up to: 4.2
8
+ Stable tag: 1.6.6
9
  License: GPLv2 or later
10
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
11
 
50
 
51
  == Changelog ==
52
 
53
+ = 1.6.6 =
54
+ * added filter attribute to pass the content through the_content filter
55
+ * changed name of wpex_clean_shortcodes function
56
+ * tested up to: WordPress 4.2-alpha-31047
57
+
58
  = 1.6.5 =
59
  * maptastic class only removed when present
60
  * maptastic has a max-width assigned to prevent content from entering display area.
279
 
280
  == Upgrade Notice ==
281
 
282
+ = 1.6.6 =
283
+ * added filter attribute to pass the content through the_content filter
284
+ * changed name of wpex_clean_shortcodes function
285
+
286
+ = 1.6.5 =
287
+ * maptastic class only removed when present
288
+ * maptastic has a max-width assigned to prevent content from entering display area.
289
+ * updated collapse-commander integration to work with new licensing system
290
+ * tested up to: WordPress 4.2-alpha-31047
291
+
292
  = 1.6.4 =
293
  * added plugin to GitHub: https://github.com/baden03/collapse-o-matic
294
  * added new tabindex attribute to shortcode and options page