Merge branch 'feature/379-multiple-format'

1 files changed, 7 insertions, 0 deletions

diff --git a/include/config_default.inc.php b/include/config_default.inc.php
index 60a3da323..eafb9d5a9 100644
--- a/include/config_default.inc.php
+++ b/include/config_default.inc.php
@@ -63,6 +63,13 @@ $conf['file_ext'] = array_merge(
   array('tiff', 'tif', 'mpg','zip','avi','mp3','ogg','pdf')
   );
 
+// enable_formats: should Piwigo search for multiple formats?
+$conf['enable_formats'] = false;
+
+// format_ext : file extensions for formats, ie additional versions of a
+// photo (or nay other file). Formats are in sub-directory pwg_format.
+$conf['format_ext'] = array('cr2', 'tif', 'tiff', 'nef', 'dng', 'ai', 'psd');
+
 // top_number : number of element to display for "best rated" and "most
 // visited" categories
 $conf['top_number'] = 15;