From 96c642661e0d12e4fb20ac7836adc9d4984cd89f Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Thu, 19 Feb 2015 10:26:49 +0100
Subject: [PATCH 1/2] The poller can now be called even inside the "include"
 directory.

---
 include/poller.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/include/poller.php b/include/poller.php
index 68f65999e3..f95d3b1807 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,4 +1,15 @@
 <?php
+if (sizeof($_SERVER["argv"]) == 0)
+	die();
+
+$directory = dirname($_SERVER["argv"][0]);
+
+if (substr($directory, 0, 1) != "/")
+	$directory = $_SERVER["PWD"]."/".$directory;
+
+$directory = realpath($directory."/..");
+
+chdir($directory);
 
 require_once("boot.php");
 

From 6d8c126179e556bf0737840dc20eb3ef797c5286 Mon Sep 17 00:00:00 2001
From: Michael Vogel <icarus@dabo.de>
Date: Thu, 19 Feb 2015 10:45:46 +0100
Subject: [PATCH 2/2] Do the directory change only when it is needed.

---
 include/poller.php | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/include/poller.php b/include/poller.php
index f95d3b1807..cefa713a0d 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -1,15 +1,14 @@
 <?php
-if (sizeof($_SERVER["argv"]) == 0)
-	die();
+if (!file_exists("boot.php") AND (sizeof($_SERVER["argv"]) != 0)) {
+	$directory = dirname($_SERVER["argv"][0]);
 
-$directory = dirname($_SERVER["argv"][0]);
+	if (substr($directory, 0, 1) != "/")
+		$directory = $_SERVER["PWD"]."/".$directory;
 
-if (substr($directory, 0, 1) != "/")
-	$directory = $_SERVER["PWD"]."/".$directory;
+	$directory = realpath($directory."/..");
 
-$directory = realpath($directory."/..");
-
-chdir($directory);
+	chdir($directory);
+}
 
 require_once("boot.php");