Merge remote-tracking branch 'upstream/develop' into 1611-parseurl

[friendica.git] / include / features.php

diff --git a/include/features.php b/include/features.php
index 87a9b46d5ab71dbd5e995cfb65fff58d7d45d7c3..4856f0f19e8678529434b7222cf86c01d0ecbf55 100644 (file)
--- a/include/features.php
+++ b/include/features.php
@@ -64,6 +64,7 @@ function get_features($filtered = true) {
                        //array('expire',         t('Content Expiration'),              t('Remove old posts/comments after a period of time')),
                        array('multi_profiles', t('Multiple Profiles'),                 t('Ability to create multiple profiles'), false, get_config('feature_lock','multi_profiles')),
                        array('photo_location', t('Photo Location'),                    t('Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map.'), false, get_config('feature_lock','photo_location')),
+                       array('export_calendar', t('Export Public Calendar'),           t('Ability for visitors to download the public calendar'), false, get_config('feature_lock','export_calendar')),
                ),
 
                // Post composition
@@ -71,7 +72,7 @@ function get_features($filtered = true) {
                        t('Post Composition Features'),
                        array('richtext',       t('Richtext Editor'),                   t('Enable richtext editor'), false, get_config('feature_lock','richtext')),
                        array('preview',        t('Post Preview'),                      t('Allow previewing posts and comments before publishing them'), false, get_config('feature_lock','preview')),
-                       array('aclautomention', t('Auto-mention Forums'),               t('Add/remove mention when a fourm page is selected/deselected in ACL window.'), false, get_config('feature_lock','aclautomention')),
+                       array('aclautomention', t('Auto-mention Forums'),               t('Add/remove mention when a forum page is selected/deselected in ACL window.'), false, get_config('feature_lock','aclautomention')),
                ),
 
                // Network sidebar widgets