aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-02-21 17:30:29 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-02-21 17:30:29 +0000
commit5e28de6ea706ad1bd89b744311e1291f8354f73e (patch)
tree3e86ebefbdc2a6c1d441b6000980b97a11335d76
parentd8af70961afb5cfab76ffffa3672ed6f1040baf4 (diff)
downloadelgg-5e28de6ea706ad1bd89b744311e1291f8354f73e.tar.gz
elgg-5e28de6ea706ad1bd89b744311e1291f8354f73e.tar.bz2
Apache's MultiViews was matching the rest page handler incorrectly
git-svn-id: http://code.elgg.org/elgg/trunk@3958 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/api.php2
-rw-r--r--services/api/rest_api.php (renamed from services/api/rest.php)0
2 files changed, 1 insertions, 1 deletions
diff --git a/engine/lib/api.php b/engine/lib/api.php
index d123ff360..6b773138e 100644
--- a/engine/lib/api.php
+++ b/engine/lib/api.php
@@ -1518,7 +1518,7 @@ function unregister_service_handler($handler) {
function rest_handler() {
global $CONFIG;
- require $CONFIG->path . "services/api/rest.php";
+ require $CONFIG->path . "services/api/rest_api.php";
}
// Initialisation /////////////////////////////////////////////////////////////
diff --git a/services/api/rest.php b/services/api/rest_api.php
index 4d3e39aaa..4d3e39aaa 100644
--- a/services/api/rest.php
+++ b/services/api/rest_api.php