From 88e8fb3a7132d1321ab65b66a19a67df890c402d Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sun, 9 Dec 2012 13:41:22 +0400
Subject: [PATCH] modify include path order (closes #514)

---
 api/index.php               | 6 +++---
 backend.php                 | 4 ++--
 db-updater.php              | 4 ++--
 digest.php                  | 4 ++--
 errors.php                  | 4 ++--
 image.php                   | 4 ++--
 index.php                   | 4 ++--
 localized_js.php            | 4 ++--
 mobile/image.php            | 6 +++---
 mobile/mobile-functions.php | 6 +++---
 opml.php                    | 4 ++--
 prefs.php                   | 4 ++--
 public.php                  | 4 ++--
 register.php                | 4 ++--
 update.php                  | 4 ++--
 update_daemon2.php          | 7 ++-----
 16 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/api/index.php b/api/index.php
index b74ea3c5..9b92dcad 100644
--- a/api/index.php
+++ b/api/index.php
@@ -3,10 +3,10 @@
 
 	require_once "../config.php";
 
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__) . PATH_SEPARATOR .
 		dirname(dirname(__FILE__)) . PATH_SEPARATOR .
-		dirname(dirname(__FILE__)) . "/include" );
+		dirname(dirname(__FILE__)) . "/include" . PATH_SEPARATOR .
+  		get_include_path());
 
 	chdir("..");
 
diff --git a/backend.php b/backend.php
index bf87b55d..511bb355 100644
--- a/backend.php
+++ b/backend.php
@@ -1,6 +1,6 @@
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . "/include");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	/* remove ill effects of magic quotes */
 
diff --git a/db-updater.php b/db-updater.php
index 216986f3..e6b3db06 100644
--- a/db-updater.php
+++ b/db-updater.php
@@ -1,6 +1,6 @@
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . "/include");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	require_once "functions.php";
 	require_once "sessions.php";
diff --git a/digest.php b/digest.php
index e16421fe..7cc17418 100644
--- a/digest.php
+++ b/digest.php
@@ -1,6 +1,6 @@
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . "/include");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	require_once "functions.php";
 	require_once "sessions.php";
diff --git a/errors.php b/errors.php
index a18d540b..8f4fd94f 100644
--- a/errors.php
+++ b/errors.php
@@ -1,6 +1,6 @@
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR . 
-		dirname(__FILE__) . "/include");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	require_once "functions.php";
 
diff --git a/image.php b/image.php
index 89d05d66..91490ea2 100644
--- a/image.php
+++ b/image.php
@@ -1,6 +1,6 @@
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . "/include");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	require_once "config.php";
 
diff --git a/index.php b/index.php
index 09c4dc8c..445a8fa7 100644
--- a/index.php
+++ b/index.php
@@ -5,8 +5,8 @@
 		exit;
 	}
 
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) ."/include");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	require_once "functions.php";
 	require_once "sessions.php";
diff --git a/localized_js.php b/localized_js.php
index 24846a32..46dbe296 100644
--- a/localized_js.php
+++ b/localized_js.php
@@ -1,6 +1,6 @@
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR . 
-		dirname(__FILE__) . "/include");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	define('DISABLE_SESSIONS', true);
 
diff --git a/mobile/image.php b/mobile/image.php
index eec72947..765fcc24 100644
--- a/mobile/image.php
+++ b/mobile/image.php
@@ -1,8 +1,8 @@
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__) . PATH_SEPARATOR .
 		dirname(dirname(__FILE__)) . PATH_SEPARATOR .
-		dirname(dirname(__FILE__)) . "/include" );
+		dirname(dirname(__FILE__)) . "/include" . PATH_SEPARATOR .
+  		get_include_path());
 
 	require_once "config.php";
 
diff --git a/mobile/mobile-functions.php b/mobile/mobile-functions.php
index c5bc71f8..ffd7ba80 100644
--- a/mobile/mobile-functions.php
+++ b/mobile/mobile-functions.php
@@ -1,8 +1,8 @@
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . PATH_SEPARATOR .
+	set_include_path(dirname(__FILE__) . PATH_SEPARATOR .
 		dirname(dirname(__FILE__)) . PATH_SEPARATOR .
-		dirname(dirname(__FILE__)) . "/include" );
+		dirname(dirname(__FILE__)) . "/include" . PATH_SEPARATOR .
+  		get_include_path());
 
 	require_once "functions.php";
 	require_once "sessions.php";
diff --git a/opml.php b/opml.php
index e9801300..a997be89 100644
--- a/opml.php
+++ b/opml.php
@@ -1,6 +1,6 @@
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . "/include");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	function __autoload($class) {
 		$file = "classes/".strtolower(basename($class)).".php";
diff --git a/prefs.php b/prefs.php
index 58a078b1..d83e2ddf 100644
--- a/prefs.php
+++ b/prefs.php
@@ -1,6 +1,6 @@
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . "/include");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	require_once "functions.php";
 	require_once "sessions.php";
diff --git a/public.php b/public.php
index bf13fdd5..59e0ef2e 100644
--- a/public.php
+++ b/public.php
@@ -1,6 +1,6 @@
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . "/include");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	/* remove ill effects of magic quotes */
 
diff --git a/register.php b/register.php
index fbcea845..b0c9bd95 100644
--- a/register.php
+++ b/register.php
@@ -4,8 +4,8 @@
 	// 1) templates/register_notice.txt - displayed above the registration form
 	// 2) register_expire_do.php - contains user expiration queries when necessary
 
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . "/include");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	require_once 'lib/phpmailer/class.phpmailer.php';
 
diff --git a/update.php b/update.php
index 08094273..8a5512ef 100755
--- a/update.php
+++ b/update.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . "/include");
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	define('DISABLE_SESSIONS', true);
 
diff --git a/update_daemon2.php b/update_daemon2.php
index 6410709a..05b55ffe 100755
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@ -1,10 +1,7 @@
 #!/usr/bin/env php
 <?php
-	set_include_path(get_include_path() . PATH_SEPARATOR .
-		dirname(__FILE__) . "/include");
-
-	// This is an experimental multiprocess update daemon.
-	// Some configurable variable may be found below.
+	set_include_path(dirname(__FILE__) ."/include" . PATH_SEPARATOR .
+		get_include_path());
 
 	declare(ticks = 1);
 	chdir(dirname(__FILE__));
-- 
2.39.2