summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceGrid/DescriptorParser.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp
index 3cb4ab07ae3..7bd40412975 100644
--- a/cpp/src/IceGrid/DescriptorParser.cpp
+++ b/cpp/src/IceGrid/DescriptorParser.cpp
@@ -171,8 +171,13 @@ DescriptorHandler::startElement(const string& name, const IceXML::Attributes& at
{
error("only one <application> element is allowed");
}
+
+ bool importTemplates = attributes.asBool("import-default-templates", false);
- if(_admin && attributes.asBool("import-default-templates", false))
+ //
+ // TODO: is ignoring importTemplates the desired behavior when _admin == 0?
+ //
+ if(importTemplates && _admin != 0)
{
try
{