summaryrefslogtreecommitdiff
path: root/application
diff options
context:
space:
mode:
authorRomain LE DISEZ <romain.git@ledisez.net>2009-06-25 08:16:35 +0200
committerRomain LE DISEZ <romain.git@ledisez.net>2009-06-25 08:16:35 +0200
commit6345fcede7493010ab78239c3e775d16c2f41458 (patch)
tree3bcdf7732386e2026a9c52688f303dd6fdffbfa5 /application
parentbe354ab98bbb08abad0a7efd6fb1d110e11381de (diff)
parentec67300f9628582bf735468c73aec3c01a6eb57f (diff)
Merge commit 'upstream/master'
Diffstat (limited to 'application')
-rw-r--r--application/config/config.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/application/config/config.php b/application/config/config.php
index 2d66d1c0..e88958ed 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -54,7 +54,7 @@ $config["site_protocol"] = "";
*
* This can be removed by using URL rewriting.
*/
-$config["index_page"] = "index.php";
+$config["index_page"] = isset($_GET["kohana_uri"]) ? "" : "index.php";
/**
* Fake file extension that will be added to all generated URLs. Example: .html