diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2006-11-27 23:33:56 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2006-11-27 23:33:56 +0100 |
| commit | 657541cb2b998443a12d674ff02e8e21f9d96299 (patch) | |
| tree | dc7daa2ee18b441851513b2d73d20410a1a7c185 | |
| parent | a1716312b3d267c93299958009452d9a20969f88 (diff) | |
| download | rpg-657541cb2b998443a12d674ff02e8e21f9d96299.tar.gz rpg-657541cb2b998443a12d674ff02e8e21f9d96299.tar.bz2 | |
conflict resolve for RSS title config option
darcs-hash:20061127223356-7ad00-6a5cd1653d6d60f534471f8eabdb84ffb953d151.gz
| -rw-r--r-- | lib/plugins/config/settings/config.metadata.php | 2 |
1 files changed, 2 insertions, 0 deletions
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'); |