summaryrefslogtreecommitdiff
path: root/installer
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-01-10 09:41:30 +0100
committerThomas Bruederli <thomas@roundcube.net>2013-01-10 09:48:53 +0100
commitbe6ef859781e5165da8ae8adec71b28aa8ba60f6 (patch)
treee112f3659c0dd0f31b8f4d315bb93f4973f24cea /installer
parent5845b2502787f6672e317bd271018e8cd778ec02 (diff)
Mark mime_magic option with old default value as obsolete
Conflicts: installer/rcube_install.php
Diffstat (limited to 'installer')
-rw-r--r--installer/rcube_install.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 2688bd721..6c6555f91 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -251,7 +251,12 @@ class rcube_install
$seen[$prop] = true;
}
}
-
+
+ // the old default mime_magic reference is obsolete
+ if ($this->config['mime_magic'] == '/usr/share/misc/magic') {
+ $out['obsolete'][] = array('prop' => 'mime_magic', 'explain' => "Set value to null in order to use system default");
+ }
+
// iterate over default config
foreach ($defaults as $prop => $value) {
if (!isset($seen[$prop]) && isset($required[$prop]) && !(is_bool($this->config[$prop]) || strlen($this->config[$prop])))