aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/actions.php
diff options
context:
space:
mode:
authoricewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-04-21 13:35:02 +0000
committericewing <icewing@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-04-21 13:35:02 +0000
commit419643394d641cf4383011c2a3d83987f9b4bf6c (patch)
tree56cea2b0ac7a3beb5bbfd32e32d20024fc6af842 /engine/lib/actions.php
parent062a19f1b9874914e7cdc82b3819ad5f85871214 (diff)
downloadelgg-419643394d641cf4383011c2a3d83987f9b4bf6c.tar.gz
elgg-419643394d641cf4383011c2a3d83987f9b4bf6c.tar.bz2
Marcus Povey <marcus@dushka.co.uk>
* Removed tiny debug output git-svn-id: https://code.elgg.org/elgg/trunk@499 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/actions.php')
-rw-r--r--engine/lib/actions.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/engine/lib/actions.php b/engine/lib/actions.php
index 58f38fd7a..004943e12 100644
--- a/engine/lib/actions.php
+++ b/engine/lib/actions.php
@@ -64,8 +64,11 @@
$CONFIG->actions = array();
}
- if (empty($filename)) {
- $filename = $CONFIG->path . "actions/" . $action . ".php";
+ if (empty($filename)) {
+ $path = "";
+ if (isset($CONFIG->path)) $path = $CONFIG->path;
+
+ $filename = $path . "actions/" . $action . ".php";
}
$CONFIG->actions[$action] = array('file' => $filename, 'public' => $public);