From 670bce6e830389387742fdee185356bf337673fb Mon Sep 17 00:00:00 2001 From: Narayan Desai Date: Sat, 22 Jan 2011 09:56:45 -0600 Subject: Cfg: pull file permissions defaults uniformly (Resolves Ticket #958) (Patch from unidentified openid user) --- src/lib/Server/Plugin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/lib/Server/Plugin.py') diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index 186d1198a..84d5896a5 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -784,10 +784,10 @@ class EntrySet: return cmp(x.specific.prio, y.specific.prio) def bind_info_to_entry(self, entry, metadata): - if not self.infoxml: - for key in self.metadata: - entry.set(key, self.metadata[key]) - else: + # first set defaults from global metadata/:info + for key in self.metadata: + entry.set(key, self.metadata[key]) + if self.infoxml: mdata = {} self.infoxml.pnode.Match(metadata, mdata) if 'Info' not in mdata: -- cgit v1.2.3-1-g7c22