diff options
author | Evan Prodromou <evan@status.net> | 2010-12-06 17:22:34 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2010-12-06 17:22:34 -0500 |
commit | 25f644f4b99bc9fed024821c94885100c105d6a2 (patch) | |
tree | 0a5d938af38c36e6ea617e95e55b956eac527674 /lib/default.php | |
parent | 8564fc51c53de7a0670720eec437000a6b972688 (diff) | |
parent | 76946ea5a3636479d713f64471e86643936bc540 (diff) |
Merge branch '0.9.x' into cacheactivity
Diffstat (limited to 'lib/default.php')
-rw-r--r-- | lib/default.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/default.php b/lib/default.php index a91fa338f..029dbb390 100644 --- a/lib/default.php +++ b/lib/default.php @@ -59,7 +59,8 @@ $default = 'textlimit' => 140, 'indent' => true, 'use_x_sendfile' => false, - 'notice' => null // site wide notice text + 'notice' => null, // site wide notice text + 'build' => 1, // build number, for code-dependent cache ), 'db' => array('database' => 'YOU HAVE TO SET THIS IN config.php', @@ -327,4 +328,6 @@ $default = array('ssl_cafile' => false, // To enable SSL cert validation, point to a CA bundle (eg '/usr/lib/ssl/certs/ca-certificates.crt') 'curl' => false, // Use CURL backend for HTTP fetches if available. (If not, PHP's socket streams will be used.) ), + 'router' => + array('cache' => true), // whether to cache the router object. Defaults to true, turn off for devel ); |