From 657541cb2b998443a12d674ff02e8e21f9d96299 Mon Sep 17 00:00:00 2001 From: Andreas Gohr Date: Mon, 27 Nov 2006 23:33:56 +0100 Subject: conflict resolve for RSS title config option darcs-hash:20061127223356-7ad00-6a5cd1653d6d60f534471f8eabdb84ffb953d151.gz --- lib/plugins/config/settings/config.metadata.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/plugins/config/settings/config.metadata.php b/lib/plugins/config/settings/config.metadata.php index 36b2be38b..38a24ebb8 100644 --- a/lib/plugins/config/settings/config.metadata.php +++ b/lib/plugins/config/settings/config.metadata.php @@ -163,6 +163,8 @@ $meta['rss_type'] = array('multichoice','_choices' => array('rss','rss1','rss $meta['rss_linkto'] = array('multichoice','_choices' => array('diff','page','rev','current')); $meta['rss_update'] = array('numeric'); $meta['recent_days'] = array('numeric'); +$meta['rss_show_summary'] = array('onoff'); +$meta['test_indexer'] = array('numeric'); // FIXME: delete when no longer needed $meta['_network'] = array('fieldset'); $meta['proxy____host'] = array('string','_pattern' => '#^[a-z0-9\-\.+]+?#i'); -- cgit v1.2.3