Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x

Conflicts:
	config.php.sample

1 files changed, 6 insertions, 0 deletions

diff --git a/index.php b/index.php
index e24bde917..9ff1c2c56 100644
--- a/index.php
+++ b/index.php
@@ -63,6 +63,10 @@ function handleError($error)
 
 function main()
 {
+    // quick check for fancy URL auto-detection support in installer.
+    if (isset($_SERVER['REDIRECT_URL']) && ('/check-fancy' === $_SERVER['REDIRECT_URL'])) {
+        die("Fancy URL support detection succeeded. We suggest you enable this to get fancy (pretty) URLs.");
+    }
     global $user, $action, $config;
 
     if (!_have_config()) {
@@ -101,6 +105,8 @@ function main()
 
     $args = array_merge($args, $_REQUEST);
 
+    Event::handle('ArgsInitialize', array(&$args));
+
     $action = $args['action'];
 
     if (!$action || !preg_match('/^[a-zA-Z0-9_-]*$/', $action)) {