summaryrefslogtreecommitdiffstats
path: root/pts-core/functions/pts-functions-merge.php
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-04-24 20:05:06 -0400
committerMichael Larabel <michael@phx-laptop.(none)>2008-04-24 20:05:06 -0400
commit7b9bb4db6b404f84e053247b3568dd538b56c152 (patch)
tree78a5e5fd749b45556452af52dcd3bac6369681dd /pts-core/functions/pts-functions-merge.php
parente9aa9a9b2011bb10cc5de8c8bd73d1f20fec2cbb (diff)
downloadphoronix-test-suite-upstream-7b9bb4db6b404f84e053247b3568dd538b56c152.tar.gz
phoronix-test-suite-upstream-7b9bb4db6b404f84e053247b3568dd538b56c152.tar.xz
phoronix-test-suite-upstream-7b9bb4db6b404f84e053247b3568dd538b56c152.zip
Clean up *_LOCATION definitions to all *_DIR
Diffstat (limited to 'pts-core/functions/pts-functions-merge.php')
-rw-r--r--pts-core/functions/pts-functions-merge.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/pts-core/functions/pts-functions-merge.php b/pts-core/functions/pts-functions-merge.php
index 997d489..aa9c546 100644
--- a/pts-core/functions/pts-functions-merge.php
+++ b/pts-core/functions/pts-functions-merge.php
@@ -6,8 +6,8 @@ function pts_find_file($file)
{
if(is_file($file))
$USE_FILE = $file;
- else if(is_file(SAVE_RESULTS_LOCATION . $file . "/composite.xml"))
- $USE_FILE = SAVE_RESULTS_LOCATION . $file . "/composite.xml";
+ else if(is_file(SAVE_RESULTS_DIR . $file . "/composite.xml"))
+ $USE_FILE = SAVE_RESULTS_DIR . $file . "/composite.xml";
else if(trim(file_get_contents("http://www.phoronix-test-suite.com/global/profile-check.php?id=$file")) == "REMOTE_FILE")
$USE_FILE = "http://www.phoronix-test-suite.com/global/pts-results-viewer.php?id=$file";
else