Changeset:
        c9602d3ac43b
        
https://sourceforge.net/p/mrbs/hg-code/ci/c9602d3ac43b98908d27ca7ccfe7f050cd9aea0e
Author:
        Campbell Morrison <[email protected]>
Date:
        Thu Oct 27 21:15:14 2016 +0100
Log message:

Fixed problem of duplicate define() in WordPress authentication

diffstat:

 web/auth/auth_wordpress.inc       |  3 +--
 web/session/session_wordpress.inc |  3 +--
 web/wordpress.inc                 |  4 ++++
 3 files changed, 6 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 7ade092c8e6a -r c9602d3ac43b web/auth/auth_wordpress.inc
--- a/web/auth/auth_wordpress.inc       Sat Oct 22 10:28:53 2016 +0100
+++ b/web/auth/auth_wordpress.inc       Thu Oct 27 21:15:14 2016 +0100
@@ -1,8 +1,7 @@
 <?php
 namespace MRBS;
 
-define('WP_USE_THEMES', false);
-require_once MRBS_ROOT . '/'. $auth['wordpress']['rel_path'] . '/wp-load.php';
+require_once MRBS_ROOT . '/wordpress.inc';
 
 /* authValidateUser($user, $pass)
  * 
diff -r 7ade092c8e6a -r c9602d3ac43b web/session/session_wordpress.inc
--- a/web/session/session_wordpress.inc Sat Oct 22 10:28:53 2016 +0100
+++ b/web/session/session_wordpress.inc Thu Oct 27 21:15:14 2016 +0100
@@ -1,8 +1,7 @@
 <?php
 namespace MRBS;
 
-define('WP_USE_THEMES', false);
-require_once MRBS_ROOT . '/'. $auth['wordpress']['rel_path'] . '/wp-load.php';
+require_once MRBS_ROOT . '/wordpress.inc';
 
 // Get non-standard form variables
 $Action = get_form_var('Action', 'string');
diff -r 7ade092c8e6a -r c9602d3ac43b web/wordpress.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/web/wordpress.inc Thu Oct 27 21:15:14 2016 +0100
@@ -0,0 +1,4 @@
+<?php
+
+define('WP_USE_THEMES', false);
+require_once MRBS_ROOT . '/'. $auth['wordpress']['rel_path'] . '/wp-load.php';

------------------------------------------------------------------------------
The Command Line: Reinvented for Modern Developers
Did the resurgence of CLI tooling catch you by surprise?
Reconnect with the command line and become more productive. 
Learn the new .NET and ASP.NET CLI. Get your free copy!
http://sdm.link/telerik
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits

Reply via email to