inc/session.php is no longer needed.

[mailer.git] / inc / inc-functions.php

diff --git a/inc/inc-functions.php b/inc/inc-functions.php
index 13ce10c5fdd6dc1695559506a180dccf443ceff4..23d0f834e0ccadbe9179f9fcccd0dcbcb33ead48 100644 (file)
--- a/inc/inc-functions.php
+++ b/inc/inc-functions.php
@@ -10,13 +10,8 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Spezielle Funktionen fuer Include-Dateien        *
  * -------------------------------------------------------------------- *
- * $Revision::                                                        $ *
- * $Date::                                                            $ *
- * $Tag:: 0.2.1-FINAL                                                 $ *
- * $Author::                                                          $ *
- * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
- * Copyright (c) 2009 - 2012 by Mailer Developer Team                   *
+ * Copyright (c) 2009 - 2013 by Mailer Developer Team                   *
  * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -93,7 +88,7 @@ function removeIncludeFromPool ($pool, $inc) {
        $key = array_search($inc, getIncludePool($pool));
 
        // Is it valid?
-       if ($key !== false) {
+       if ($key !== FALSE) {
                // Then remove it
                unset($GLOBALS['inc_pool'][$pool][$key]);
 
@@ -122,7 +117,7 @@ function loadInclude ($inc) {
                // Is the include file there?
                if (!isIncludeReadable($inc)) {
                        // Not there so log it
-                       reportBug(__FUNCTION__, __LINE__, sprintf("Include file %s not found or deprecated.", $inc));
+                       reportBug(__FUNCTION__, __LINE__, sprintf('Include file %s not found or deprecated.', $inc));
                } // END - if
 
                // Add the path. This is why we need a trailing slash in config.php
@@ -136,10 +131,7 @@ function loadInclude ($inc) {
 // Loads an include file once
 function loadIncludeOnce ($inc) {
        // Is it not loaded?
-       if (!isset($GLOBALS['load_once'][$inc])) {
-               // Mark it as loaded
-               $GLOBALS['load_once'][$inc] = 'loaded';
-
+       if (!isset($GLOBALS['inc_loaded'][$inc])) {
                // Then try to load it
                loadInclude($inc);
        } // END - if