diff options
author | Andrew Dolgov <[email protected]> | 2012-12-09 13:41:22 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2012-12-09 13:41:22 +0400 |
commit | 88e8fb3a7132d1321ab65b66a19a67df890c402d (patch) | |
tree | b597639dfe7797a34efe0e348ef6e37a8a11b467 | |
parent | 51cc387347668e98b1b8e6c6053581a2affc5fa6 (diff) |
modify include path order (closes #514)
-rw-r--r-- | api/index.php | 6 | ||||
-rw-r--r-- | backend.php | 4 | ||||
-rw-r--r-- | db-updater.php | 4 | ||||
-rw-r--r-- | digest.php | 4 | ||||
-rw-r--r-- | errors.php | 4 | ||||
-rw-r--r-- | image.php | 4 | ||||
-rw-r--r-- | index.php | 4 | ||||
-rw-r--r-- | localized_js.php | 4 | ||||
-rw-r--r-- | mobile/image.php | 6 | ||||
-rw-r--r-- | mobile/mobile-functions.php | 6 | ||||
-rw-r--r-- | opml.php | 4 | ||||
-rw-r--r-- | prefs.php | 4 | ||||
-rw-r--r-- | public.php | 4 | ||||
-rw-r--r-- | register.php | 4 | ||||
-rwxr-xr-x | update.php | 4 | ||||
-rwxr-xr-x | update_daemon2.php | 7 |
16 files changed, 35 insertions, 38 deletions
diff --git a/api/index.php b/api/index.php index b74ea3c56..9b92dcadd 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 bf87b55d3..511bb3552 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 216986f39..e6b3db06a 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 e16421fe3..7cc174185 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 a18d540bd..8f4fd94fa 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"; @@ -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"; @@ -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 24846a320..46dbe2961 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 eec72947f..765fcc240 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 c5bc71f80..ffd7ba80d 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"; @@ -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"; @@ -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 bf13fdd58..59e0ef2e3 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 fbcea845d..b0c9bd95f 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 080942736..8a5512efb 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 6410709ad..05b55ffe3 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__)); |