Theme My Login - Version 6.4.8

Version Description

  • Fix errors and messages not displaying anywhere except default pages
  • Don't exclude TML pages from search in admin area or if not the main query
Download this release

Release Info

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

Code changes from version 6.4.7 to 6.4.8

Files changed (4) hide show
  1. includes/class-theme-my-login.php +12 -3
  2. languages/theme-my-login.pot +25 -25
  3. readme.txt +6 -2
  4. theme-my-login.php +1 -1
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.4.7';
25
 
26
  /**
27
  * Holds options key
@@ -130,6 +130,9 @@ class Theme_My_Login extends Theme_My_Login_Abstract {
130
  */
131
  protected function load() {
132
 
 
 
 
133
  $this->load_instance();
134
 
135
  add_action( 'plugins_loaded', array( $this, 'plugins_loaded' ) );
@@ -253,6 +256,14 @@ class Theme_My_Login extends Theme_My_Login_Abstract {
253
  */
254
  public function pre_get_posts( $query ) {
255
 
 
 
 
 
 
 
 
 
256
  // Bail if not a search
257
  if ( ! $query->is_search )
258
  return;
@@ -294,10 +305,8 @@ class Theme_My_Login extends Theme_My_Login_Abstract {
294
  * @access public
295
  */
296
  public function template_redirect() {
297
- $this->request_action = isset( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : '';
298
  if ( ! $this->request_action && self::is_tml_page() )
299
  $this->request_action = self::get_page_action( get_the_id() );
300
- $this->request_instance = isset( $_REQUEST['instance'] ) ? sanitize_key( $_REQUEST['instance'] ) : 0;
301
 
302
  do_action_ref_array( 'tml_request', array( &$this ) );
303
 
21
  * @since 6.3.2
22
  * @const string
23
  */
24
+ const VERSION = '6.4.8';
25
 
26
  /**
27
  * Holds options key
130
  */
131
  protected function load() {
132
 
133
+ $this->request_action = isset( $_REQUEST['action'] ) ? sanitize_key( $_REQUEST['action'] ) : '';
134
+ $this->request_instance = isset( $_REQUEST['instance'] ) ? (int) $_REQUEST['instance'] : 0;
135
+
136
  $this->load_instance();
137
 
138
  add_action( 'plugins_loaded', array( $this, 'plugins_loaded' ) );
256
  */
257
  public function pre_get_posts( $query ) {
258
 
259
+ // Bail if in admin area
260
+ if ( is_admin() )
261
+ return;
262
+
263
+ // Bail if not the main query
264
+ if ( ! $wp_query->is_main_query() )
265
+ return;
266
+
267
  // Bail if not a search
268
  if ( ! $query->is_search )
269
  return;
305
  * @access public
306
  */
307
  public function template_redirect() {
 
308
  if ( ! $this->request_action && self::is_tml_page() )
309
  $this->request_action = self::get_page_action( get_the_id() );
 
310
 
311
  do_action_ref_array( 'tml_request', array( &$this ) );
312
 
languages/theme-my-login.pot CHANGED
@@ -2,10 +2,10 @@
2
  # This file is distributed under the same license as the Theme My Login package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: Theme My Login 6.4.7\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/theme-my-"
7
  "login-6.4\n"
8
- "POT-Creation-Date: 2017-01-06 18:03:10+00:00\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
@@ -326,7 +326,7 @@ msgstr ""
326
  msgid "A login form for your blog."
327
  msgstr ""
328
 
329
- #. #-#-#-#-# theme-my-login.pot (Theme My Login 6.4.7) #-#-#-#-#
330
  #. Plugin Name of the plugin/theme
331
  #: includes/class-theme-my-login-widget.php:26
332
  msgid "Theme My Login"
@@ -382,76 +382,76 @@ msgstr ""
382
  msgid "Reset Password"
383
  msgstr ""
384
 
385
- #: includes/class-theme-my-login.php:364
386
  msgid ""
387
  "Your password reset link appears to be invalid. Please request a new link "
388
  "below."
389
  msgstr ""
390
 
391
- #: includes/class-theme-my-login.php:366
392
  msgid "Your password reset link has expired. Please request a new link below."
393
  msgstr ""
394
 
395
- #: includes/class-theme-my-login.php:404
396
  msgid "The passwords do not match."
397
  msgstr ""
398
 
399
- #: includes/class-theme-my-login.php:503
400
  msgid "You are now logged out."
401
  msgstr ""
402
 
403
- #: includes/class-theme-my-login.php:505
404
  msgid "User registration is currently not allowed."
405
  msgstr ""
406
 
407
- #: includes/class-theme-my-login.php:507
408
  msgid "Check your e-mail for the confirmation link."
409
  msgstr ""
410
 
411
- #: includes/class-theme-my-login.php:509
412
  msgid "Your password has been reset."
413
  msgstr ""
414
 
415
- #: includes/class-theme-my-login.php:511
416
  msgid "Registration complete. Please check your e-mail."
417
  msgstr ""
418
 
419
- #: includes/class-theme-my-login.php:513
420
  msgid "Your session has expired. Please log-in again."
421
  msgstr ""
422
 
423
- #: includes/class-theme-my-login.php:515
424
  msgid ""
425
  "<strong>You have successfully updated WordPress!</strong> Please log back in "
426
  "to experience the awesomeness."
427
  msgstr ""
428
 
429
- #: includes/class-theme-my-login.php:517
430
  msgid "Please log in to continue."
431
  msgstr ""
432
 
433
- #: includes/class-theme-my-login.php:837
434
  msgid "<strong>ERROR</strong>: Invalid email address."
435
  msgstr ""
436
 
437
- #: includes/class-theme-my-login.php:1137
438
  msgid "<strong>ERROR</strong>: Enter a username or e-mail address."
439
  msgstr ""
440
 
441
- #: includes/class-theme-my-login.php:1141
442
  msgid ""
443
  "<strong>ERROR</strong>: There is no user registered with that email address."
444
  msgstr ""
445
 
446
- #: includes/class-theme-my-login.php:1153
447
  msgid "<strong>ERROR</strong>: Invalid username or e-mail."
448
  msgstr ""
449
 
450
- #: includes/class-theme-my-login.php:1166
451
  msgid "Someone requested that the password be reset for the following account:"
452
  msgstr ""
453
 
454
- #: includes/class-theme-my-login.php:1168
455
  #: modules/custom-email/custom-email.php:843
456
  #: modules/custom-email/custom-email.php:872
457
  #: modules/user-moderation/admin/user-moderation-admin.php:382
@@ -459,26 +459,26 @@ msgstr ""
459
  msgid "Username: %s"
460
  msgstr ""
461
 
462
- #: includes/class-theme-my-login.php:1169
463
  msgid "If this was a mistake, just ignore this email and nothing will happen."
464
  msgstr ""
465
 
466
- #: includes/class-theme-my-login.php:1170
467
  msgid "To reset your password, visit the following address:"
468
  msgstr ""
469
 
470
- #: includes/class-theme-my-login.php:1181
471
  msgid "[%s] Password Reset"
472
  msgstr ""
473
 
474
- #: includes/class-theme-my-login.php:1187
475
  #: modules/user-moderation/admin/user-moderation-admin.php:252
476
  #: modules/user-moderation/admin/user-moderation-admin.php:394
477
  #: modules/user-moderation/admin/user-moderation-admin.php:436
478
  msgid "The e-mail could not be sent."
479
  msgstr ""
480
 
481
- #: includes/class-theme-my-login.php:1187
482
  #: modules/user-moderation/admin/user-moderation-admin.php:252
483
  #: modules/user-moderation/admin/user-moderation-admin.php:394
484
  #: modules/user-moderation/admin/user-moderation-admin.php:436
2
  # This file is distributed under the same license as the Theme My Login package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: Theme My Login 6.4.8\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/theme-my-"
7
  "login-6.4\n"
8
+ "POT-Creation-Date: 2017-02-19 17:53:14+00:00\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
326
  msgid "A login form for your blog."
327
  msgstr ""
328
 
329
+ #. #-#-#-#-# theme-my-login.pot (Theme My Login 6.4.8) #-#-#-#-#
330
  #. Plugin Name of the plugin/theme
331
  #: includes/class-theme-my-login-widget.php:26
332
  msgid "Theme My Login"
382
  msgid "Reset Password"
383
  msgstr ""
384
 
385
+ #: includes/class-theme-my-login.php:373
386
  msgid ""
387
  "Your password reset link appears to be invalid. Please request a new link "
388
  "below."
389
  msgstr ""
390
 
391
+ #: includes/class-theme-my-login.php:375
392
  msgid "Your password reset link has expired. Please request a new link below."
393
  msgstr ""
394
 
395
+ #: includes/class-theme-my-login.php:413
396
  msgid "The passwords do not match."
397
  msgstr ""
398
 
399
+ #: includes/class-theme-my-login.php:512
400
  msgid "You are now logged out."
401
  msgstr ""
402
 
403
+ #: includes/class-theme-my-login.php:514
404
  msgid "User registration is currently not allowed."
405
  msgstr ""
406
 
407
+ #: includes/class-theme-my-login.php:516
408
  msgid "Check your e-mail for the confirmation link."
409
  msgstr ""
410
 
411
+ #: includes/class-theme-my-login.php:518
412
  msgid "Your password has been reset."
413
  msgstr ""
414
 
415
+ #: includes/class-theme-my-login.php:520
416
  msgid "Registration complete. Please check your e-mail."
417
  msgstr ""
418
 
419
+ #: includes/class-theme-my-login.php:522
420
  msgid "Your session has expired. Please log-in again."
421
  msgstr ""
422
 
423
+ #: includes/class-theme-my-login.php:524
424
  msgid ""
425
  "<strong>You have successfully updated WordPress!</strong> Please log back in "
426
  "to experience the awesomeness."
427
  msgstr ""
428
 
429
+ #: includes/class-theme-my-login.php:526
430
  msgid "Please log in to continue."
431
  msgstr ""
432
 
433
+ #: includes/class-theme-my-login.php:846
434
  msgid "<strong>ERROR</strong>: Invalid email address."
435
  msgstr ""
436
 
437
+ #: includes/class-theme-my-login.php:1146
438
  msgid "<strong>ERROR</strong>: Enter a username or e-mail address."
439
  msgstr ""
440
 
441
+ #: includes/class-theme-my-login.php:1150
442
  msgid ""
443
  "<strong>ERROR</strong>: There is no user registered with that email address."
444
  msgstr ""
445
 
446
+ #: includes/class-theme-my-login.php:1162
447
  msgid "<strong>ERROR</strong>: Invalid username or e-mail."
448
  msgstr ""
449
 
450
+ #: includes/class-theme-my-login.php:1175
451
  msgid "Someone requested that the password be reset for the following account:"
452
  msgstr ""
453
 
454
+ #: includes/class-theme-my-login.php:1177
455
  #: modules/custom-email/custom-email.php:843
456
  #: modules/custom-email/custom-email.php:872
457
  #: modules/user-moderation/admin/user-moderation-admin.php:382
459
  msgid "Username: %s"
460
  msgstr ""
461
 
462
+ #: includes/class-theme-my-login.php:1178
463
  msgid "If this was a mistake, just ignore this email and nothing will happen."
464
  msgstr ""
465
 
466
+ #: includes/class-theme-my-login.php:1179
467
  msgid "To reset your password, visit the following address:"
468
  msgstr ""
469
 
470
+ #: includes/class-theme-my-login.php:1190
471
  msgid "[%s] Password Reset"
472
  msgstr ""
473
 
474
+ #: includes/class-theme-my-login.php:1196
475
  #: modules/user-moderation/admin/user-moderation-admin.php:252
476
  #: modules/user-moderation/admin/user-moderation-admin.php:394
477
  #: modules/user-moderation/admin/user-moderation-admin.php:436
478
  msgid "The e-mail could not be sent."
479
  msgstr ""
480
 
481
+ #: includes/class-theme-my-login.php:1196
482
  #: modules/user-moderation/admin/user-moderation-admin.php:252
483
  #: modules/user-moderation/admin/user-moderation-admin.php:394
484
  #: modules/user-moderation/admin/user-moderation-admin.php:436
readme.txt CHANGED
@@ -3,8 +3,8 @@ Contributors: jfarthing84
3
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=EZLVANPT4A9SW
4
  Tags: widget, login, registration, theme, custom, log in, register, sidebar, gravatar, redirection, e-mail
5
  Requires at least: 4.5
6
- Tested up to: 4.7.1
7
- Stable tag: 6.4.7
8
 
9
  Themes the WordPress login pages according to your theme.
10
 
@@ -57,6 +57,10 @@ Please visit https://wordpress.org/support/plugin/theme-my-login.
57
 
58
  == Changelog ==
59
 
 
 
 
 
60
  = 6.4.7 =
61
  * Don't allow locked users to log in using their email address
62
 
3
  Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=EZLVANPT4A9SW
4
  Tags: widget, login, registration, theme, custom, log in, register, sidebar, gravatar, redirection, e-mail
5
  Requires at least: 4.5
6
+ Tested up to: 4.7.2
7
+ Stable tag: 6.4.8
8
 
9
  Themes the WordPress login pages according to your theme.
10
 
57
 
58
  == Changelog ==
59
 
60
+ = 6.4.8 =
61
+ * Fix errors and messages not displaying anywhere except default pages
62
+ * Don't exclude TML pages from search in admin area or if not the main query
63
+
64
  = 6.4.7 =
65
  * Don't allow locked users to log in using their email address
66
 
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.4.7
7
  Author: Jeff Farthing
8
  Author URI: http://www.jfarthing.com
9
  Text Domain: theme-my-login
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.4.8
7
  Author: Jeff Farthing
8
  Author URI: http://www.jfarthing.com
9
  Text Domain: theme-my-login