s2Member Framework (Member Roles, Capabilities, Membership, PayPal Members) - Version 130513

Version Description

= v130513 = (Maintenance Release) Upgrade immediately.

Download this release

Release Info

Developer WebSharks
Plugin Icon 128x128 s2Member Framework (Member Roles, Capabilities, Membership, PayPal Members)
Version 130513
Comparing to
See all releases

Code changes from version 130510 to 130513

Files changed (9) hide show
  1. checksum.txt +1 -1
  2. includes/classes/installation.inc.php +1 -1
  3. includes/classes/sc-files-in.inc.php +1 -1
  4. includes/templates/players/jwplayer-v6-rtmp-only.php +1 -1
  5. includes/templates/players/jwplayer-v6-rtmp.php +1 -1
  6. includes/templates/players/jwplayer-v6.php +1 -1
  7. includes/translations/s2member.pot +2 -2
  8. readme.txt +7 -3
  9. s2member.php +9 -5
checksum.txt CHANGED
@@ -1 +1 @@
1
- d7658341b8c8aff89c2d46de12573d1b
1
+ 166c616c7ba979776c192f9e6fcc5769
includes/classes/installation.inc.php CHANGED
@@ -171,7 +171,7 @@ if(!class_exists("c_ws_plugin__s2member_installation"))
171
  c_ws_plugin__s2member_roles_caps::unlink_roles /* Unlink Roles/Caps. */();
172
 
173
  c_ws_plugin__s2member_files::remove_no_gzip_from_root_htaccess /* Remove GZIP exclusions. */();
174
-
175
  if(is_dir($files_dir = $GLOBALS["WS_PLUGIN__"]["s2member"]["c"]["files_dir"]))
176
  {
177
  if(file_exists($htaccess = $files_dir."/.htaccess"))
171
  c_ws_plugin__s2member_roles_caps::unlink_roles /* Unlink Roles/Caps. */();
172
 
173
  c_ws_plugin__s2member_files::remove_no_gzip_from_root_htaccess /* Remove GZIP exclusions. */();
174
+
175
  if(is_dir($files_dir = $GLOBALS["WS_PLUGIN__"]["s2member"]["c"]["files_dir"]))
176
  {
177
  if(file_exists($htaccess = $files_dir."/.htaccess"))
includes/classes/sc-files-in.inc.php CHANGED
@@ -151,7 +151,7 @@ if(!class_exists("c_ws_plugin__s2member_sc_files_in"))
151
 
152
  $get = preg_replace("/%%player_controls%%/", ((filter_var($attr["player_controls"], FILTER_VALIDATE_BOOLEAN)) ? "true" : "false"), $get);
153
  $get = preg_replace("/%%player_width%%/", ((strpos($attr["player_width"], "%") !== FALSE) ? "'".$attr["player_width"]."'" : (integer)$attr["player_width"]), $get);
154
- $get = preg_replace("/%%player_height%%/", ($attr["player_aspectratio"]) ? "" : ((strpos($attr["player_height"], "%") !== FALSE) ? "'".$attr["player_height"]."'" : (integer)$attr["player_height"])), $get);
155
  $get = preg_replace("/%%player_aspectratio%%/", $attr["player_aspectratio"], $get);
156
  $get = preg_replace("/%%player_skin%%/", $attr["player_skin"], $get);
157
  $get = preg_replace("/%%player_stretching%%/", $attr["player_stretching"], $get);
151
 
152
  $get = preg_replace("/%%player_controls%%/", ((filter_var($attr["player_controls"], FILTER_VALIDATE_BOOLEAN)) ? "true" : "false"), $get);
153
  $get = preg_replace("/%%player_width%%/", ((strpos($attr["player_width"], "%") !== FALSE) ? "'".$attr["player_width"]."'" : (integer)$attr["player_width"]), $get);
154
+ $get = preg_replace("/%%player_height%%/", (($attr["player_aspectratio"]) ? "''" : ((strpos($attr["player_height"], "%") !== FALSE) ? "'".$attr["player_height"]."'" : (integer)$attr["player_height"])), $get);
155
  $get = preg_replace("/%%player_aspectratio%%/", $attr["player_aspectratio"], $get);
156
  $get = preg_replace("/%%player_skin%%/", $attr["player_skin"], $get);
157
  $get = preg_replace("/%%player_stretching%%/", $attr["player_stretching"], $get);
includes/templates/players/jwplayer-v6-rtmp-only.php CHANGED
@@ -32,7 +32,7 @@ if (realpath (__FILE__) === realpath ($_SERVER["SCRIPT_FILENAME"]))
32
  stretching: '%%player_stretching%%',
33
  width: %%player_width%%,
34
  height: %%player_height%%,
35
- aspectratio: %%player_aspectratio%%,
36
 
37
  autostart: %%player_autostart%%,
38
  fallback: %%player_fallback%%,
32
  stretching: '%%player_stretching%%',
33
  width: %%player_width%%,
34
  height: %%player_height%%,
35
+ aspectratio: '%%player_aspectratio%%',
36
 
37
  autostart: %%player_autostart%%,
38
  fallback: %%player_fallback%%,
includes/templates/players/jwplayer-v6-rtmp.php CHANGED
@@ -33,7 +33,7 @@ if (realpath (__FILE__) === realpath ($_SERVER["SCRIPT_FILENAME"]))
33
  stretching: '%%player_stretching%%',
34
  width: %%player_width%%,
35
  height: %%player_height%%,
36
- aspectratio: %%player_aspectratio%%,
37
 
38
  autostart: %%player_autostart%%,
39
  fallback: %%player_fallback%%,
33
  stretching: '%%player_stretching%%',
34
  width: %%player_width%%,
35
  height: %%player_height%%,
36
+ aspectratio: '%%player_aspectratio%%',
37
 
38
  autostart: %%player_autostart%%,
39
  fallback: %%player_fallback%%,
includes/templates/players/jwplayer-v6.php CHANGED
@@ -32,7 +32,7 @@ if (realpath (__FILE__) === realpath ($_SERVER["SCRIPT_FILENAME"]))
32
  stretching: '%%player_stretching%%',
33
  width: %%player_width%%,
34
  height: %%player_height%%,
35
- aspectratio: %%player_aspectratio%%,
36
 
37
  autostart: %%player_autostart%%,
38
  fallback: %%player_fallback%%,
32
  stretching: '%%player_stretching%%',
33
  width: %%player_width%%,
34
  height: %%player_height%%,
35
+ aspectratio: '%%player_aspectratio%%',
36
 
37
  autostart: %%player_autostart%%,
38
  fallback: %%player_fallback%%,
includes/translations/s2member.pot CHANGED
@@ -2,9 +2,9 @@
2
  # This file is distributed under the same license as the s2Member® Framework package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: s2Member® Framework 130406\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/s2member\n"
7
- "POT-Creation-Date: 2013-05-11 07:15:51+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
2
  # This file is distributed under the same license as the s2Member® Framework package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: s2Member® Framework 130513\n"
6
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/s2member\n"
7
+ "POT-Creation-Date: 2013-05-13 20:44:42+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
readme.txt CHANGED
@@ -1,7 +1,7 @@
1
  === s2Member® Framework (Member Roles, Capabilities, Membership, PayPal Members) ===
2
 
3
- Version: 130510
4
- Stable tag: 130510
5
 
6
  SSL Compatible: yes
7
  bbPress® Compatible: yes
@@ -92,11 +92,15 @@ Please see [this FAQ entry](http://www.s2member.com/faqs/#s2-faqs-translations)
92
 
93
  == Upgrade Notice ==
94
 
95
- = v130510 =
96
  (Maintenance Release) Upgrade immediately.
97
 
98
  == Changelog ==
99
 
 
 
 
 
100
  = v130510 =
101
  * (s2Member Pro) **Authorize.Net UK (and Other Currencies) (#104)** Adding support for Authorize.Net UK and other currencies too. s2Member Pro now officially supports Authorize.Net UK Edition. It is now possible to change your Authorize.Net Pro Form Shortcode Attribute `cc="USD"` to one of these values: `cc="USD"`, or `cc="CAD"` or `cc="EUR"` or `cc="GBP"`. For further details, please see: `Dashboard -› Authorize.Net Pro Forms -› Shortcode Attributes (Explained)`.
102
  * (s2Member Pro) **ClickBank Skins (#227)** Adding support for the `cbskin=""` Shortcode Attribute. For further details, please see: `Dashboard -› ClickBank Buttons -› Shortcode Attributes (Explained)`.
1
  === s2Member® Framework (Member Roles, Capabilities, Membership, PayPal Members) ===
2
 
3
+ Version: 130513
4
+ Stable tag: 130513
5
 
6
  SSL Compatible: yes
7
  bbPress® Compatible: yes
92
 
93
  == Upgrade Notice ==
94
 
95
+ = v130513 =
96
  (Maintenance Release) Upgrade immediately.
97
 
98
  == Changelog ==
99
 
100
+ = v130513 =
101
+ * (s2Member/s2Member Pro) **s2Stream Shortcode Bug Fix (#256)** Fixing a bug first introduced in the previous release where we added support for `player_aspectratio`. This quick update corrects the PHP parse error at line #154 of `sc-files-in.inc.php`. It also corrects the behavior of the `player_height=""` and `player_aspectratio=""` Shortcode Attributes for the `s2Stream` Shortcode. Many thanks to everyone that reported this bug.
102
+ * (s2Member Pro) **Codestyling Localization** Removing symlink creator for Codestyleing Localization compatibility. There have been some reports of problems during WordPress® automatic upgrades (when/if the symlink exists). Until we can find a way to avoid this, we're disabling the automatic symlink generator. If you're running the Codestyling Localization plugin together with s2Member Pro, you will need to create the symlink yourself if you want to make s2Member fully compatible. Please create a symlink here: `/wp-content/plugins/s2member/s2member-pro` that points to the s2Member Pro directory: `/wp-content/plugins/s2member-pro`. See notes in previous changelog for further details on this.
103
+
104
  = v130510 =
105
  * (s2Member Pro) **Authorize.Net UK (and Other Currencies) (#104)** Adding support for Authorize.Net UK and other currencies too. s2Member Pro now officially supports Authorize.Net UK Edition. It is now possible to change your Authorize.Net Pro Form Shortcode Attribute `cc="USD"` to one of these values: `cc="USD"`, or `cc="CAD"` or `cc="EUR"` or `cc="GBP"`. For further details, please see: `Dashboard -› Authorize.Net Pro Forms -› Shortcode Attributes (Explained)`.
106
  * (s2Member Pro) **ClickBank Skins (#227)** Adding support for the `cbskin=""` Shortcode Attribute. For further details, please see: `Dashboard -› ClickBank Buttons -› Shortcode Attributes (Explained)`.
s2member.php CHANGED
@@ -19,8 +19,8 @@
19
  */
20
  /* -- This section for WordPress® parsing. ------------------------------------------------------------------------------
21
 
22
- Version: 130510
23
- Stable tag: 130510
24
 
25
  SSL Compatible: yes
26
  bbPress® Compatible: yes
@@ -75,7 +75,7 @@ if(realpath(__FILE__) === realpath($_SERVER["SCRIPT_FILENAME"]))
75
  * @var str
76
  */
77
  if(!defined("WS_PLUGIN__S2MEMBER_VERSION"))
78
- define("WS_PLUGIN__S2MEMBER_VERSION", "130510" /* !#distro-version#! */);
79
  /**
80
  * Minimum PHP version required to run s2Member.
81
  *
@@ -105,7 +105,7 @@ if(!defined("WS_PLUGIN__S2MEMBER_MIN_WP_VERSION"))
105
  * @var str
106
  */
107
  if(!defined("WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION"))
108
- define("WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION", "130510" /* !#distro-version#! */);
109
  /*
110
  Several compatibility checks.
111
  If all pass, load the s2Member plugin.
@@ -136,7 +136,11 @@ if(version_compare(PHP_VERSION, WS_PLUGIN__S2MEMBER_MIN_PHP_VERSION, ">=") && ve
136
  {
137
  include_once dirname(__FILE__)."-pro/pro-module.php";
138
  if(is_dir(WP_PLUGIN_DIR."/codestyling-localization") && !is_dir(dirname(__FILE__)."/s2member-pro") && function_exists("symlink"))
139
- @symlink(dirname(__FILE__)."-pro", dirname(__FILE__)."/s2member-pro"); // For CS localization compatibility.
 
 
 
 
140
  }
141
  /*
142
  Configure options and their defaults.
19
  */
20
  /* -- This section for WordPress® parsing. ------------------------------------------------------------------------------
21
 
22
+ Version: 130513
23
+ Stable tag: 130513
24
 
25
  SSL Compatible: yes
26
  bbPress® Compatible: yes
75
  * @var str
76
  */
77
  if(!defined("WS_PLUGIN__S2MEMBER_VERSION"))
78
+ define("WS_PLUGIN__S2MEMBER_VERSION", "130513" /* !#distro-version#! */);
79
  /**
80
  * Minimum PHP version required to run s2Member.
81
  *
105
  * @var str
106
  */
107
  if(!defined("WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION"))
108
+ define("WS_PLUGIN__S2MEMBER_MIN_PRO_VERSION", "130513" /* !#distro-version#! */);
109
  /*
110
  Several compatibility checks.
111
  If all pass, load the s2Member plugin.
136
  {
137
  include_once dirname(__FILE__)."-pro/pro-module.php";
138
  if(is_dir(WP_PLUGIN_DIR."/codestyling-localization") && !is_dir(dirname(__FILE__)."/s2member-pro") && function_exists("symlink"))
139
+ {
140
+ // Removing this for now. It causes problems during upgrades.
141
+ //@symlink(dirname(__FILE__)."-pro", dirname(__FILE__)."/s2member-pro"); // For CS localization compatibility.
142
+ //@chmod(dirname(__FILE__)."/s2member-pro", 0755);
143
+ }
144
  }
145
  /*
146
  Configure options and their defaults.