From d36fc526195a2175f32109e580136f23ffd91155 Mon Sep 17 00:00:00 2001 From: tomash Date: Thu, 24 Aug 2006 11:22:52 +0000 Subject: [PATCH] #1715 - fixed problem with PHP include path in tests --- livesupport/src/modules/storageServer/var/conf.php | 12 ++++++------ .../modules/storageServer/var/xmlrpc/xr_cli_test.php | 1 + 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/livesupport/src/modules/storageServer/var/conf.php b/livesupport/src/modules/storageServer/var/conf.php index 9a584d866..00ac43c80 100644 --- a/livesupport/src/modules/storageServer/var/conf.php +++ b/livesupport/src/modules/storageServer/var/conf.php @@ -85,12 +85,12 @@ $config = array( 'StationPrefsGr'=> 'StationPrefs', 'AllGr' => 'All', 'TrashName' => 'trash_', - 'storageDir' => dirname(__FILE__).'/../../storageServer/var/stor', - 'bufferDir' => dirname(__FILE__).'/../../storageServer/var/stor/buffer', - 'transDir' => dirname(__FILE__).'/../../storageServer/var/trans', - 'accessDir' => dirname(__FILE__).'/../../storageServer/var/access', - 'pearPath' => dirname(__FILE__).'/../../../../usr/lib/pear', - 'cronDir' => dirname(__FILE__).'/../../storageServer/var/cron', + 'storageDir' => realpath(dirname(__FILE__).'/../../storageServer/var/stor'), + 'bufferDir' => realpath(dirname(__FILE__).'/../../storageServer/var/stor/buffer'), + 'transDir' => realpath(dirname(__FILE__).'/../../storageServer/var/trans'), + 'accessDir' => realpath(dirname(__FILE__).'/../../storageServer/var/access'), + 'pearPath' => realpath(dirname(__FILE__).'/../../../../usr/lib/pear'), + 'cronDir' => realpath(dirname(__FILE__).'/../../storageServer/var/cron'), 'isArchive' => FALSE, 'validate' => TRUE, 'useTrash' => TRUE, diff --git a/livesupport/src/modules/storageServer/var/xmlrpc/xr_cli_test.php b/livesupport/src/modules/storageServer/var/xmlrpc/xr_cli_test.php index 4c35ae212..3ed799770 100644 --- a/livesupport/src/modules/storageServer/var/xmlrpc/xr_cli_test.php +++ b/livesupport/src/modules/storageServer/var/xmlrpc/xr_cli_test.php @@ -28,6 +28,7 @@ ------------------------------------------------------------------------------*/ +require_once dirname(__FILE__).'/../conf.php'; include_once "XML/RPC.php"; include_once dirname(__FILE__)."/../conf.php";