1
0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-12-23 07:27:05 +00:00

Revert "Allow customizations to Roundcube settings to persist between updates by including a configuration override file, if it exists (#2333)"

This reverts commit 1b8cdeb644.

It didn't execute. I should have tried it first.
This commit is contained in:
Joshua Tauberer 2024-03-10 08:25:13 -04:00
parent 0b1d92388a
commit 18b8f9ab4b

View File

@ -145,9 +145,6 @@ cat > $RCM_CONFIG <<EOF;
\$config['session_path'] = '/mail/';
/* prevent CSRF, requires php 7.3+ */
\$config['session_samesite'] = 'Strict';
/* Persist Customizations */
\$file = __DIR__.'/config_override.inc.php';
\if(file_exists($file)) { include $file; }
?>
EOF
@ -169,9 +166,6 @@ cat > ${RCM_PLUGIN_DIR}/carddav/config.inc.php <<EOF;
'preemptive_auth' => '1',
'hide' => false,
);
/* Persist Customizations */
\$file = __DIR__.'/config_override.inc.php';
\if(file_exists($file)) { include $file; }
?>
EOF