Merge remote-tracking branch 'origin/master'

[jirafeau.git] / lib / config.original.php

diff --git a/lib/config.original.php b/lib/config.original.php
index 05631e6cfa5728b2646847fadea0446dbaed3810..b07f0e2386a748ed63fc5f802d5ff63d3ea9214a 100644 (file)
--- a/lib/config.original.php
+++ b/lib/config.original.php
@@ -17,13 +17,13 @@
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  *  You should have received a copy of the GNU Affero General Public License
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */

- 
+

 /*
  * default configuration
  * if you want to change this, overwrite in a config.local.php file
  */
 global $cfg;
 /*
  * default configuration
  * if you want to change this, overwrite in a config.local.php file
  */
 global $cfg;

- 
+

 /* Don't forget the ending '/' */
 $cfg['web_root'] = '';
 $cfg['var_root'] = '';
 /* Don't forget the ending '/' */
 $cfg['web_root'] = '';
 $cfg['var_root'] = '';


@@ -85,6 +85,10 @@ $cfg['availabilities'] = array ('minute' => true,
                                 'month' => true,
                                 'year' => false,
                                 'none' => false);
                                 'month' => true,
                                 'year' => false,
                                 'none' => false);

+/* Set a default value for the expiration time.
+ * The value has to equal one of the enabled options in »availabilities«, e.g. »month«)
+ */
+$cfg['availability_default'] = 'month';

 /* Set maximal upload size expressed in MB.
  * 0 mean unlimited upload size.
  */
 /* Set maximal upload size expressed in MB.
  * 0 mean unlimited upload size.
  */