Merge branch 'friendika-master'

1 files changed, 23 insertions, 13 deletions

diff --git a/include/directory.php b/include/directory.php
index 5f835dc4b..2c9daa5ea 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -1,17 +1,22 @@
 <?php
-
-	require_once("boot.php");
-
-	$a = new App;
-
-	@include(".htconfig.php");
-	require_once("dba.php");
-	$db = new dba($db_host, $db_user, $db_pass, $db_data);
-		unset($db_host, $db_user, $db_pass, $db_data);
-
+require_once("boot.php");
+
+function directory_run($argv, $argc){
+  global $a, $db;
+
+  if(is_null($a)){
+    $a = new App;
+  }
+  
+  if(is_null($db)){
+    @include(".htconfig.php");
+    require_once("dba.php");
+    $db = new dba($db_host, $db_user, $db_pass, $db_data);
+    unset($db_host, $db_user, $db_pass, $db_data);
+  };
 
 	if($argc != 2)
-		exit;
+		return;
 
 	load_config('system');
 
@@ -20,9 +25,14 @@
 	$dir = get_config('system','directory_submit_url');
 
 	if(! strlen($dir))
-		exit;
+		return;
 
 	fetch_url($dir . '?url=' . bin2hex($argv[1]));
 
-	exit;
+	return;
+}
 
+if (array_search(__file__,get_included_files())===0){
+  directory_run($argv,$argc);
+  killme();
+}