From: Evan Prodromou <evan@controlyourself.ca>
Date: Tue, 26 May 2009 02:47:23 +0000 (-0400)
Subject: Merge branch '0.8.x' into stats
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=76aa85fe5ef408cecf7c40c0c56d58ff9ac9fcbb;p=quix0rs-gnu-social.git

Merge branch '0.8.x' into stats

Conflicts:
	README
---

76aa85fe5ef408cecf7c40c0c56d58ff9ac9fcbb
diff --cc README
index 136b537c7d,4f93829601..9207f3e900
--- a/README
+++ b/README
@@@ -1133,32 -1133,9 +1133,35 @@@ welcome: nickname of a user account tha
           busy servers it may be a good idea to keep that one just for
           'urgent' messages. Default is null; no message.
  
+ If either of these special user accounts are specified, the users should
+ be created before the configuration is updated.
+ 
 +snapshot
 +--------
 +
 +The software will, by default, send statistical snapshots about the
 +local installation to a stats server on the laconi.ca Web site. This
 +data is used by the developers to prioritize development decisions. No
 +identifying data about users or organizations is collected. The data
 +is available to the public for review. Participating in this survey
 +helps Laconica developers take your needs into account when updating
 +the software.
 +
 +run: string indicating when to run the statistics. Values can be 'web'
 +     (run occasionally at Web time), 'cron' (run from a cron script),
 +     or 'never' (don't ever run). If you set it to 'cron', remember to
 +     schedule the script to run on a regular basis.
 +frequency: if run value is 'web', how often to report statistics.
 +           Measured in Web hits; depends on how active your site is.
 +           Default is 10000 -- that is, one report every 10000 Web hits,
 +           on average.
 +reporturl: URL to post statistics to. Defaults to Laconica developers'
 +           report system, but if they go evil or disappear you may
 +           need to update this to another value. Note: if you
 +           don't want to report stats, it's much better to
 +           set 'run' to 'never' than to set this value to something
 +           nonsensical.
 +
  Troubleshooting
  ===============
  
diff --cc index.php
index 3f25e004d7,9ff1c2c56a..b79fefc85a
--- a/index.php
+++ b/index.php
@@@ -63,10 -63,12 +63,14 @@@ 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;
  
 +    Snapshot::check();
 +    
      if (!_have_config()) {
          $msg = sprintf(_("No configuration file found. Try running ".
                           "the installation program first."));