Tim Fry vor 1 Jahr
Ursprung
Commit
924bf63962
1 geänderte Dateien mit 2 neuen und 0 gelöschten Zeilen
  1. 2 0
      resources/classes/service.php

+ 2 - 0
resources/classes/service.php

@@ -718,6 +718,7 @@ abstract class service {
 			require_once __DIR__ . '/settings.php';
 			require_once __DIR__ . '/settings.php';
 		}
 		}
 
 
+		//TODO remove global functions after merge
 		if (file_exists(dirname(__DIR__).'/functions.php')) {
 		if (file_exists(dirname(__DIR__).'/functions.php')) {
 			require_once dirname(__DIR__).'/functions.php';
 			require_once dirname(__DIR__).'/functions.php';
 		}
 		}
@@ -739,6 +740,7 @@ abstract class service {
 		//initialize the service
 		//initialize the service
 		$service->init();
 		$service->init();
 
 
+		//return the initialized object
 		return $service;
 		return $service;
 	}
 	}