3 files changed, 51 insertions, 5 deletions
diff --git a/conf/dokuwiki.php b/conf/dokuwiki.php
index 5e185e9c2..298c8e572 100644
--- a/conf/dokuwiki.php
+++ b/conf/dokuwiki.php
@@ -20,6 +20,7 @@ $conf['basedir']     = '';                //absolute dir from serveroot - blank
 $conf['baseurl']     = '';                //URL to server including protocol - blank for autodetect
 $conf['savedir']     = './data';          //where to store all the files
 $conf['allowdebug']  = 0;                 //allow debug output, enable if needed 0|1
+$conf['mediarevisions'] = 1;              //enable/disable media revisions
 
 /* Display Options */
 
diff --git a/conf/mediameta.php b/conf/mediameta.php
index ba7117643..0428a4b88 100644
--- a/conf/mediameta.php
+++ b/conf/mediameta.php
@@ -29,29 +29,63 @@ $fields = array(
                 'img_title',
                 'text'),
 
-    20 => array('Iptc.Caption',
+    20 => array('',
+                'img_date',
+                'date',
+                array('Date.EarliestTime')),
+
+    30 => array('',
+                'img_fname',
+                'text',
+                array('File.Name')),
+
+    40 => array('Iptc.Caption',
                 'img_caption',
                 'textarea',
                 array('Exif.UserComment',
                       'Exif.TIFFImageDescription',
                       'Exif.TIFFUserComment')),
 
-    30 => array('Iptc.Byline',
+    50 => array('Iptc.Byline',
                 'img_artist',
                 'text',
                 array('Exif.TIFFArtist',
                       'Exif.Artist',
                       'Iptc.Credit')),
 
-    40 => array('Iptc.CopyrightNotice',
+    60 => array('Iptc.CopyrightNotice',
                 'img_copyr',
                 'text',
                 array('Exif.TIFFCopyright',
                       'Exif.Copyright')),
 
-    50 => array('Iptc.Keywords',
+    70 => array('',
+                'img_format',
+                'text',
+                array('File.Format')),
+
+    80 => array('',
+                'img_fsize',
+                'text',
+                array('File.NiceSize')),
+
+    90 => array('',
+                'img_width',
+                'text',
+                array('File.Width')),
+
+    100 => array('',
+                'img_height',
+                'text',
+                array('File.Height')),
+
+    110 => array('',
+                'img_camera',
+                'text',
+                array('Simple.Camera')),
+
+    120 => array('Iptc.Keywords',
                 'img_keywords',
                 'text',
                 array('Exif.Category')),
 );
-
diff --git a/conf/plugins.protected.php b/conf/plugins.protected.php
new file mode 100644
index 000000000..26eb8888b
--- /dev/null
+++ b/conf/plugins.protected.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * This file configures the enabled/disabled status of plugins, which are also protected
+ * from changes by the extention manager. These settings will override any local settings.
+ * It is not recommended to change this file, as it is overwritten on DokuWiki upgrades.
+ */
+$plugins['acl']         = 1;
+$plugins['plugin']      = 1;
+$plugins['config']      = 1;
+$plugins['usermanager'] = 1;
+$plugins['revert']      = 1;