Changeset:
32dcfd1f1928
https://sourceforge.net/p/mrbs/hg-code/ci/32dcfd1f1928ae3f798e5b052bae812d7bff16ba
Author:
Campbell Morrison <[email protected]>
Date:
Fri Dec 09 16:26:45 2016 +0000
Log message:
Got rid of the 'DS' (DIRECTORY_SEPARATOR) constant as it is unnecessary and
causes clashes with Joomla.
diffstat:
web/auth/cms/joomla.inc | 8 ++++----
web/internalconfig.inc.php | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
diffs (36 lines):
diff -r 6c4209d3e17a -r 32dcfd1f1928 web/auth/cms/joomla.inc
--- a/web/auth/cms/joomla.inc Mon Dec 05 10:10:46 2016 +0000
+++ b/web/auth/cms/joomla.inc Fri Dec 09 16:26:45 2016 +0000
@@ -4,17 +4,17 @@
define('_JEXEC', 1);
-$joomla_path = realpath(MRBS_ROOT . DS . $auth['joomla']['rel_path']);
+$joomla_path = realpath(MRBS_ROOT . '/' . $auth['joomla']['rel_path']);
if ($joomla_path === false)
{
- $message = MRBS_ROOT . DS . $auth['joomla']['rel_path'] . ' does not exist.
Check the setting ' .
+ $message = MRBS_ROOT . '/' . $auth['joomla']['rel_path'] . ' does not exist.
Check the setting ' .
'of $auth["joomla"]["rel_path"] in your config file.';
die($message); // Too early for fatal_error()
}
define('JPATH_BASE', $joomla_path);
-require_once JPATH_BASE . DS . 'includes' . DS . 'defines.php';
-require_once JPATH_BASE . DS . 'includes' . DS . 'framework.php';
+require_once JPATH_BASE . '/includes/defines.php';
+require_once JPATH_BASE . '/includes/framework.php';
diff -r 6c4209d3e17a -r 32dcfd1f1928 web/internalconfig.inc.php
--- a/web/internalconfig.inc.php Mon Dec 05 10:10:46 2016 +0000
+++ b/web/internalconfig.inc.php Fri Dec 09 16:26:45 2016 +0000
@@ -296,7 +296,6 @@
* DIRECTORIES - internal use, do not change
*************************************************/
-define('DS', DIRECTORY_SEPARATOR );
define('MRBS_ROOT', __DIR__); // Root of MRBS
installation
define('TZDIR', 'tzurl/zoneinfo'); // Directory containing
TZURL definitions
define('TZDIR_OUTLOOK', 'tzurl/zoneinfo-outlook'); // Outlook compatible
TZURL definitions
------------------------------------------------------------------------------
Developer Access Program for Intel Xeon Phi Processors
Access to Intel Xeon Phi processor-based developer platforms.
With one year of Intel Parallel Studio XE.
Training and support from Colfax.
Order your platform today.http://sdm.link/xeonphi
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
