Merge pull request #13272 from annando/last-editor-uid

[friendica.git] / static / defaults.config.php

diff --git a/static/defaults.config.php b/static/defaults.config.php
index 7e699fad714ba3f6a06368bd3c6fcd6fc0156ce3..e8f44613ce2d0034f0df335f5338d440ba7e8daa 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -310,10 +310,10 @@ return [
                // Number of "free" searches when system => permit_crawling is enabled.
                'free_crawls' => 10,
 
-               // groupedit_image_limit (Integer)
-               // Number of contacts at which the group editor should switch from display the profile pictures of the contacts to only display the names.
+               // circle_edit_image_limit (Integer)
+               // Number of contacts at which the circle editor should switch from display the profile pictures of the contacts to only display the names.
                // This can alternatively be set on a per-account basis in the pconfig table.
-               'groupedit_image_limit' => 400,
+               'circle_edit_image_limit' => 400,
 
                // gserver_update_limit (Integer)
                // How many servers should be checked at a time?
@@ -341,6 +341,14 @@ return [
                // Resolve IPV4 addresses only. Don't resolve to IPV6.
                'ipv4_resolve' => false,
 
+               // ini_max_execution_time (False|Integer)
+               // Set the number of seconds a script is allowed to run. Default unlimited for Friendica, false to use the system value.
+               'ini_max_execution_time' => 0,
+
+               // ini_pcre_backtrack_limit (False|Integer)
+               // This has to be quite large to deal with embedded private photos. False to use the system value.
+               'ini_pcre_backtrack_limit' => 500000,
+
                // invitation_only (Boolean)
                // If set true registration is only possible after a current member of the node has sent an invitation.
                'invitation_only' => false,
@@ -625,7 +633,7 @@ return [
                'throttle_limit_month' => 0,
 
                // transmit_pending_events (Boolean)
-               // Transmit pending events upon accepted contact request for forums
+               // Transmit pending events upon accepted contact request for groups
                'transmit_pending_events' => false,
 
                // update_active_contacts (Boolean)
@@ -773,4 +781,9 @@ return [
                // By default the template cache is stored in several subdirectories.
                'use_sub_dirs' => true,
        ],
+       'api' => [
+               // mastodon_banner (String)
+               // Banner for Mastodon API
+               'mastodon_banner' => '/images/friendica-banner.jpg',
+       ],
 ];