Theme My Login - Version 6.3.6

Version Description

  • Fix issue where all module options were set once activated
  • Fix issue where template tag was not being output
  • Fix issue where install failed during new blog creation on multisite
  • Fix issue where error messages were duplicated on login pages
Download this release

Release Info

Developer jfarthing84
Plugin Icon 128x128 Theme My Login
Version 6.3.6
Comparing to
See all releases

Code changes from version 6.3.5 to 6.3.6

Files changed (9) hide show
  1. admin/class-theme-my-login-admin.php +4 -4
  2. includes/class-theme-my-login-template.php +1 -1
  3. includes/class-theme-my-login.php +4 -1
  4. modules/ajax/css/ajax.css +6 -0
  5. modules/custom-email/admin/custom-email-admin.php +2 -2
  6. modules/security/admin/security-admin.php +2 -2
  7. modules/themed-profiles/admin/themed-profiles-admin.php +2 -2
  8. readme.txt +7 -1
  9. theme-my-login.php +2 -2
admin/class-theme-my-login-admin.php CHANGED
@@ -191,8 +191,8 @@ class Theme_My_Login_Admin extends Theme_My_Login_Abstract {
191
  * @return string|array Sanitized settings
192
  */
193
  public function save_settings( $settings ) {
194
- $settings['enable_css'] = isset( $settings['enable_css'] );
195
- $settings['email_login'] = isset( $settings['email_login'] );
196
  $settings['active_modules'] = isset( $settings['active_modules'] ) ? (array) $settings['active_modules'] : array();
197
 
198
  // If we have modules to activate
@@ -220,9 +220,9 @@ class Theme_My_Login_Admin extends Theme_My_Login_Abstract {
220
  * Installs TML
221
  *
222
  * @since 6.0
223
- * @access private
224
  */
225
- private function install() {
226
  // Current version
227
  $version = $this->get_option( 'version', Theme_My_Login::version );
228
 
191
  * @return string|array Sanitized settings
192
  */
193
  public function save_settings( $settings ) {
194
+ $settings['enable_css'] = ! empty( $settings['enable_css'] );
195
+ $settings['email_login'] = ! empty( $settings['email_login'] );
196
  $settings['active_modules'] = isset( $settings['active_modules'] ) ? (array) $settings['active_modules'] : array();
197
 
198
  // If we have modules to activate
220
  * Installs TML
221
  *
222
  * @since 6.0
223
+ * @access public
224
  */
225
+ public function install() {
226
  // Current version
227
  $version = $this->get_option( 'version', Theme_My_Login::version );
228
 
includes/class-theme-my-login-template.php CHANGED
@@ -144,7 +144,7 @@ class Theme_My_Login_Template extends Theme_My_Login_Abstract {
144
  $action = $this->get_option( 'default_action' );
145
 
146
  if ( is_admin() )
147
- return $title;
148
 
149
  if ( is_user_logged_in() && 'login' == $action && $action == $this->get_option( 'default_action' ) ) {
150
  $title = sprintf( __( 'Welcome, %s', 'theme-my-login' ), wp_get_current_user()->display_name );
144
  $action = $this->get_option( 'default_action' );
145
 
146
  if ( is_admin() )
147
+ return;
148
 
149
  if ( is_user_logged_in() && 'login' == $action && $action == $this->get_option( 'default_action' ) ) {
150
  $title = sprintf( __( 'Welcome, %s', 'theme-my-login' ), wp_get_current_user()->display_name );
includes/class-theme-my-login.php CHANGED
@@ -21,7 +21,7 @@ class Theme_My_Login extends Theme_My_Login_Abstract {
21
  * @since 6.3.2
22
  * @const string
23
  */
24
- const version = '6.3.5';
25
 
26
  /**
27
  * Holds options key
@@ -786,6 +786,9 @@ if(typeof wpOnload=='function')wpOnload()
786
  if ( self::is_tml_page() && in_the_loop() && is_main_query() && ! $did_main_instance ) {
787
  $instance = $this->get_instance();
788
 
 
 
 
789
  if ( ! empty( $this->request_action ) )
790
  $atts['default_action'] = $this->request_action;
791
 
21
  * @since 6.3.2
22
  * @const string
23
  */
24
+ const version = '6.3.6';
25
 
26
  /**
27
  * Holds options key
786
  if ( self::is_tml_page() && in_the_loop() && is_main_query() && ! $did_main_instance ) {
787
  $instance = $this->get_instance();
788
 
789
+ if ( ! empty( $this->request_instance ) )
790
+ $instance->set_active( false );
791
+
792
  if ( ! empty( $this->request_action ) )
793
  $atts['default_action'] = $this->request_action;
794
 
modules/ajax/css/ajax.css CHANGED
@@ -49,10 +49,16 @@
49
  -webkit-box-sizing: border-box;
50
  box-sizing: border-box;
51
  }
 
 
 
52
  #tml_ajax_content ul {
53
  margin: 5px 0;
54
  list-style-position: inside;
55
  }
 
 
 
56
  #tml_ajax_content .tml-user-avatar {
57
  float: left;
58
  }
49
  -webkit-box-sizing: border-box;
50
  box-sizing: border-box;
51
  }
52
+ #tml_ajax_content p {
53
+ margin: 5px 0;
54
+ }
55
  #tml_ajax_content ul {
56
  margin: 5px 0;
57
  list-style-position: inside;
58
  }
59
+ #tml_ajax_content li {
60
+ margin: 5px 0;
61
+ }
62
  #tml_ajax_content .tml-user-avatar {
63
  float: left;
64
  }
modules/custom-email/admin/custom-email-admin.php CHANGED
@@ -604,8 +604,8 @@ class Theme_My_Login_Custom_Email_Admin extends Theme_My_Login_Abstract {
604
  * @return string|array Sanitized settings
605
  */
606
  public function save_settings( $settings ) {
607
- $settings['new_user']['admin_disable'] = isset( $settings['new_user']['admin_disable'] );
608
- $settings['reset_pass']['admin_disable'] = isset( $settings['reset_pass']['admin_disable'] );
609
 
610
  if ( class_exists( 'Theme_My_Login_User_Moderation' ) )
611
  $settings['user_approval']['admin_disable'] = isset( $settings['user_approval']['admin_disable'] );
604
  * @return string|array Sanitized settings
605
  */
606
  public function save_settings( $settings ) {
607
+ $settings['new_user']['admin_disable'] = ! empty( $settings['new_user']['admin_disable'] );
608
+ $settings['reset_pass']['admin_disable'] = ! empty( $settings['reset_pass']['admin_disable'] );
609
 
610
  if ( class_exists( 'Theme_My_Login_User_Moderation' ) )
611
  $settings['user_approval']['admin_disable'] = isset( $settings['user_approval']['admin_disable'] );
modules/security/admin/security-admin.php CHANGED
@@ -204,8 +204,8 @@ class Theme_My_Login_Security_Admin extends Theme_My_Login_Abstract {
204
  */
205
  public function save_settings( $settings ) {
206
  return array(
207
- 'private_site' => isset( $settings['private_site'] ),
208
- 'private_login' => isset( $settings['private_login'] ),
209
  'failed_login' => array(
210
  'threshold' => absint( $settings['failed_login']['threshold'] ),
211
  'threshold_duration' => absint( $settings['failed_login']['threshold_duration'] ),
204
  */
205
  public function save_settings( $settings ) {
206
  return array(
207
+ 'private_site' => ! empty( $settings['private_site'] ),
208
+ 'private_login' => ! empty( $settings['private_login'] ),
209
  'failed_login' => array(
210
  'threshold' => absint( $settings['failed_login']['threshold'] ),
211
  'threshold_duration' => absint( $settings['failed_login']['threshold_duration'] ),
modules/themed-profiles/admin/themed-profiles-admin.php CHANGED
@@ -202,8 +202,8 @@ class Theme_My_Login_Themed_Profiles_Admin extends Theme_My_Login_Abstract {
202
  foreach( $wp_roles->get_names() as $role => $role_name ) {
203
  if ( 'pending' != $role ) {
204
  $settings[$role] = array(
205
- 'theme_profile' => isset( $settings[$role]['theme_profile'] ),
206
- 'restrict_admin' => isset( $settings[$role]['restrict_admin'] )
207
  );
208
  }
209
  }
202
  foreach( $wp_roles->get_names() as $role => $role_name ) {
203
  if ( 'pending' != $role ) {
204
  $settings[$role] = array(
205
+ 'theme_profile' => ! empty( $settings[$role]['theme_profile'] ),
206
+ 'restrict_admin' => ! empty( $settings[$role]['restrict_admin'] )
207
  );
208
  }
209
  }
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: jfarthing84
3
  Tags: widget, login, registration, theme, custom, log in, register, sidebar, gravatar, redirection, e-mail
4
  Requires at least: 3.1
5
  Tested up to: 3.5.1
6
- Stable tag: 6.3.5
7
 
8
  Themes the WordPress login pages according to your theme.
9
 
@@ -56,6 +56,12 @@ Please visit http://www.jfarthing.com/development/theme-my-login first and then
56
 
57
  == Changelog ==
58
 
 
 
 
 
 
 
59
  = 6.3.5 =
60
  * Fix issue with blank pages where page.php didn't exists in a theme
61
  * Fix issue where activating Themed Profiles resulted in a 404 for profile page
3
  Tags: widget, login, registration, theme, custom, log in, register, sidebar, gravatar, redirection, e-mail
4
  Requires at least: 3.1
5
  Tested up to: 3.5.1
6
+ Stable tag: 6.3.6
7
 
8
  Themes the WordPress login pages according to your theme.
9
 
56
 
57
  == Changelog ==
58
 
59
+ = 6.3.6 =
60
+ * Fix issue where all module options were set once activated
61
+ * Fix issue where template tag was not being output
62
+ * Fix issue where install failed during new blog creation on multisite
63
+ * Fix issue where error messages were duplicated on login pages
64
+
65
  = 6.3.5 =
66
  * Fix issue with blank pages where page.php didn't exists in a theme
67
  * Fix issue where activating Themed Profiles resulted in a 404 for profile page
theme-my-login.php CHANGED
@@ -3,7 +3,7 @@
3
  Plugin Name: Theme My Login
4
  Plugin URI: http://www.jfarthing.com/extend/wordpress-plugins/theme-my-login/
5
  Description: Themes the WordPress login, registration and forgot password pages according to your theme.
6
- Version: 6.3.5
7
  Author: Jeff Farthing
8
  Author URI: http://www.jfarthing.com
9
  Text Domain: theme-my-login
@@ -47,7 +47,7 @@ if ( ! function_exists( 'theme_my_login' ) ) :
47
  * @param string|array $args Template tag arguments
48
  */
49
  function theme_my_login( $args = '' ) {
50
- Theme_My_Login::get_object()->shortcode( wp_parse_args( $args ) );
51
  }
52
  endif;
53
 
3
  Plugin Name: Theme My Login
4
  Plugin URI: http://www.jfarthing.com/extend/wordpress-plugins/theme-my-login/
5
  Description: Themes the WordPress login, registration and forgot password pages according to your theme.
6
+ Version: 6.3.6
7
  Author: Jeff Farthing
8
  Author URI: http://www.jfarthing.com
9
  Text Domain: theme-my-login
47
  * @param string|array $args Template tag arguments
48
  */
49
  function theme_my_login( $args = '' ) {
50
+ echo Theme_My_Login::get_object()->shortcode( wp_parse_args( $args ) );
51
  }
52
  endif;
53