Groups - Version 1.0.0-beta-3c

Version Description

  • Groups shortcodes now allow nesting.
Download this release

Release Info

Developer itthinx
Plugin Icon 128x128 Groups
Version 1.0.0-beta-3c
Comparing to
See all releases

Code changes from version 1.0.0-beta-3b to 1.0.0-beta-3c

Files changed (4) hide show
  1. COPYRIGHT.txt +1 -1
  2. groups.php +1 -1
  3. lib/access/class-groups-access-shortcodes.php +12 -0
  4. readme.txt +8 -1
COPYRIGHT.txt CHANGED
@@ -1,7 +1,7 @@
1
 
2
  Groups
3
 
4
- Copyright 2011 "kento" (Karim Rahimpur) www.itthinx.com
5
 
6
  The files COPYRIGHT.txt and LICENSE.txt as well as ALL NOTICES IN THE
7
  HEADERS OF ALL FILES MUST BE KEPT INTACT.
1
 
2
  Groups
3
 
4
+ Copyright 2011,2012 "kento" (Karim Rahimpur) www.itthinx.com
5
 
6
  The files COPYRIGHT.txt and LICENSE.txt as well as ALL NOTICES IN THE
7
  HEADERS OF ALL FILES MUST BE KEPT INTACT.
groups.php CHANGED
@@ -21,7 +21,7 @@
21
  * Plugin Name: Groups
22
  * Plugin URI: http://www.itthinx.com/plugins/groups
23
  * Description: Groups provides group-based user membership management, group-based capabilities and content access control.
24
- * Version: 1.0.0-beta-3b
25
  * Author: itthinx (Karim Rahimpur)
26
  * Author URI: http://www.itthinx.com
27
  * Donate-Link: http://www.itthinx.com
21
  * Plugin Name: Groups
22
  * Plugin URI: http://www.itthinx.com/plugins/groups
23
  * Description: Groups provides group-based user membership management, group-based capabilities and content access control.
24
+ * Version: 1.0.0-beta-3c
25
  * Author: itthinx (Karim Rahimpur)
26
  * Author URI: http://www.itthinx.com
27
  * Donate-Link: http://www.itthinx.com
lib/access/class-groups-access-shortcodes.php CHANGED
@@ -63,6 +63,9 @@ class Groups_Access_Shortcodes {
63
  }
64
  }
65
  if ( $show_content ) {
 
 
 
66
  $output = $content;
67
  }
68
  }
@@ -98,6 +101,9 @@ class Groups_Access_Shortcodes {
98
  }
99
  }
100
  if ( $show_content ) {
 
 
 
101
  $output = $content;
102
  }
103
  }
@@ -118,6 +124,9 @@ class Groups_Access_Shortcodes {
118
  $groups_user = new Groups_User( get_current_user_id() );
119
  $capability = $options['capability'];
120
  if ( $groups_user->can( $capability ) ) {
 
 
 
121
  $output = $content;
122
  }
123
  }
@@ -138,6 +147,9 @@ class Groups_Access_Shortcodes {
138
  $groups_user = new Groups_User( get_current_user_id() );
139
  $capability = $options['capability'];
140
  if ( !$groups_user->can( $capability ) ) {
 
 
 
141
  $output = $content;
142
  }
143
  }
63
  }
64
  }
65
  if ( $show_content ) {
66
+ remove_shortcode( 'groups_member' );
67
+ $content = do_shortcode( $content );
68
+ add_shortcode( 'groups_member', array( __CLASS__, 'groups_member' ) );
69
  $output = $content;
70
  }
71
  }
101
  }
102
  }
103
  if ( $show_content ) {
104
+ remove_shortcode( 'groups_non_member' );
105
+ $content = do_shortcode( $content );
106
+ add_shortcode( 'groups_non_member', array( __CLASS__, 'groups_non_member' ) );
107
  $output = $content;
108
  }
109
  }
124
  $groups_user = new Groups_User( get_current_user_id() );
125
  $capability = $options['capability'];
126
  if ( $groups_user->can( $capability ) ) {
127
+ remove_shortcode( 'groups_can' );
128
+ $content = do_shortcode( $content );
129
+ add_shortcode( 'groups_can', array( __CLASS__, 'groups_can' ) );
130
  $output = $content;
131
  }
132
  }
147
  $groups_user = new Groups_User( get_current_user_id() );
148
  $capability = $options['capability'];
149
  if ( !$groups_user->can( $capability ) ) {
150
+ remove_shortcode( 'groups_can_not' );
151
+ $content = do_shortcode( $content );
152
+ add_shortcode( 'groups_can_not', array( __CLASS__, 'groups_can_not' ) );
153
  $output = $content;
154
  }
155
  }
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: http://www.itthinx.com/plugins/groups
4
  Tags: access, access control, capability, capabilities, content, group, groups, member, members, membership, permission, permissions
5
  Requires at least: 3.0
6
  Tested up to: 3.3.1
7
- Stable tag: 1.0.0-beta-3b
8
 
9
  Groups provides group-based user membership management, group-based capabilities and content access control.
10
 
@@ -232,6 +232,9 @@ See also [Groups](http://www.itthinx.com/plugins/groups/)
232
 
233
  == Changelog ==
234
 
 
 
 
235
  = 1.0.0-beta-3b =
236
  * Fixed admin override option not being updated
237
  * DB tables checked individually to create (motivated by case of all but capability table not being created)
@@ -249,6 +252,9 @@ See also [Groups](http://www.itthinx.com/plugins/groups/)
249
 
250
  == Upgrade Notice ==
251
 
 
 
 
252
  = 1.0.0-beta-3b =
253
  * Admin override fix and DB tables checked individually to create them.
254
 
@@ -266,3 +272,4 @@ See also [Groups](http://www.itthinx.com/plugins/groups/)
266
 
267
  The Groups plugin provides an extensive framework to handle memberships, group-based capabilities and access control.
268
  Read more on the official [Groups](http://www.itthinx.com/plugins/groups/) page and the [Groups documentation](http://www.itthinx.com/documentation/groups/) page.
 
4
  Tags: access, access control, capability, capabilities, content, group, groups, member, members, membership, permission, permissions
5
  Requires at least: 3.0
6
  Tested up to: 3.3.1
7
+ Stable tag: 1.0.0-beta-3c
8
 
9
  Groups provides group-based user membership management, group-based capabilities and content access control.
10
 
232
 
233
  == Changelog ==
234
 
235
+ = 1.0.0-beta-3c =
236
+ * Groups shortcodes now allow nesting.
237
+
238
  = 1.0.0-beta-3b =
239
  * Fixed admin override option not being updated
240
  * DB tables checked individually to create (motivated by case of all but capability table not being created)
252
 
253
  == Upgrade Notice ==
254
 
255
+ = 1.0.0-beta-3c =
256
+ * Groups shortcodes now allow nesting: [groups_member], [groups_non_member], [groups_can], [groups_can_not]
257
+
258
  = 1.0.0-beta-3b =
259
  * Admin override fix and DB tables checked individually to create them.
260
 
272
 
273
  The Groups plugin provides an extensive framework to handle memberships, group-based capabilities and access control.
274
  Read more on the official [Groups](http://www.itthinx.com/plugins/groups/) page and the [Groups documentation](http://www.itthinx.com/documentation/groups/) page.
275
+