X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Finc-functions.php;h=7279db570a12ac27aada5b7f362c61363900b367;hb=de318c2b4c5b20c8423144a14cf26d6b8694c128;hp=ee808594438db16295ca8c916ad7f772bfc504de;hpb=1c4e78c5d68b97b82a3b930aa6db1e6df188f653;p=mailer.git diff --git a/inc/inc-functions.php b/inc/inc-functions.php index ee80859443..7279db570a 100644 --- a/inc/inc-functions.php +++ b/inc/inc-functions.php @@ -14,11 +14,9 @@ * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * * $Author:: $ * - * Needs to be in all Files and every File needs "svn propset * - * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009, 2010 by Mailer Developer Team * + * Copyright (c) 2009 - 2011 by Mailer Developer Team * * For more information visit: http://www.mxchange.org * * * * This program is free software; you can redistribute it and/or modify * @@ -118,7 +116,7 @@ function loadInclude ($inc) { // Do we have cache? if (!isset($GLOBALS['inc_loaded'][$inc])) { // Add the path. This is why we need a trailing slash in config.php - $GLOBALS['inc_loaded'][$inc] = getConfig('PATH') . $inc; + $GLOBALS['inc_loaded'][$inc] = getPath() . $inc; // Is the include file there? if (!isIncludeReadable($inc)) { @@ -133,9 +131,6 @@ function loadInclude ($inc) { // Loads an include file once function loadIncludeOnce ($inc) { - // Remove double path - $inc = str_replace(getConfig('PATH'), '', $inc); - // Is it not loaded? if (!isset($GLOBALS['load_once'][$inc])) { // Mark it as loaded @@ -150,11 +145,8 @@ function loadIncludeOnce ($inc) { function isIncludeReadable ($inc) { // Do we have cache? if (!isset($GLOBALS['inc_readable'][$inc])) { - // Remove double path - $inc = str_replace(getConfig('PATH'), '', $inc); - // Construct FQFN - $FQFN = getConfig('PATH') . $inc; + $FQFN = getPath() . $inc; // Is it readable? $GLOBALS['inc_readable'][$inc] = isFileReadable($FQFN);