modify include path order (closes #514)

diff --git a/api/index.php b/api/index.php
index b74ea3c5680aeab5ce42d2db7fbf3c2d49db2b2a..9b92dcaddfff0d1e3173d2adc8d31be5014f82af 100644 (file)
--- 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 bf87b55d3e63cc40aaca58b15aeac8984f6dc860..511bb35528245b5b015aa44660372184e731f2e9 100644 (file)
--- 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 216986f39e79413d9a60a8c9dd2c0951fd585049..e6b3db06a466abc0fb77ae6e4001136030ff497c 100644 (file)
--- 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 e16421fe37e633c5ca54f59d64abab8ba9f176d1..7cc174185f5ebc18cf127493811d1ab164d17424 100644 (file)
--- 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 a18d540bdbf67f1a4e13acbe696e96914a1ad769..8f4fd94fa86eecb2da0926c7cd3dc117267a8a8e 100644 (file)
--- 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 89d05d66036a49d379b3d39241365b22e7d729e7..91490ea226da1eb272db5a99afb494f390df0c6e 100644 (file)
--- 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 09c4dc8c7c83ae3e74e69c599f10a48fc38b257a..445a8fa75e2b5b8da50990b62d3f6f545cb7f907 100644 (file)
--- 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 24846a3205336e5d30a5359ba72c2fb8dff9dbab..46dbe2961131e3ce93904731a344d3cce7ebfc87 100644 (file)
--- 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 eec72947fd1efd17e320903c4dc64aaa7085b087..765fcc240fc2d50df5a49bf7cffaeca1df8af5c1 100644 (file)
--- 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 c5bc71f80476bbc5217f75924891f02523460b15..ffd7ba80d10b9c91f456c2104be78228ffb84897 100644 (file)
--- 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 e98013009e4335693efbd7557e3c1355e28b4070..a997be89b2be080091e9026a6c47b2c313d42e07 100644 (file)
--- 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 58a078b1faba627c2faf5c0d9578891eb6d74ee0..d83e2ddf3491b9248e139c900e5f85a4afce01eb 100644 (file)
--- 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 bf13fdd583040aa21f82c4226effe4458822b158..59e0ef2e3696082acbc9cb9ab2f017a60817747d 100644 (file)
--- 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 fbcea845dc6f4f9fa11f67f69170eb472d296ba6..b0c9bd95fa86fdd69dd6ed5a527d4f66a1dad105 100644 (file)
--- 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 0809427365df2af404720476fa5b9e043c4b7940..8a5512efbbf3840e476b00e85ea4860aeb0761d5 100755 (executable)
--- 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 6410709adf37882be1df4a7dc51bc663f4c13bd4..05b55ffe311a636901d9f20648227ffeeb88711f 100755 (executable)
--- 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__));