Commit ee2d0ea1 authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files

Merge branch 'master' of git-public.flux.utah.edu:/flux/git/emulab-devel

parents d85afe43 e8470d63
......@@ -210,9 +210,11 @@ sub SetText($$$)
} elsif (scalar(@grand) == 0
&& $child->nodeType() == XML_ELEMENT_NODE) {
$child->appendText($text);
$result = 1;
}
} elsif ($node->nodeType() == XML_ELEMENT_NODE) {
$node->setAttribute($name, $text);
$result = 1;
}
}
return $result;
......
......@@ -3133,7 +3133,7 @@ CREATE TABLE `sitevariables` (
`value` text,
`defaultvalue` text NOT NULL,
`description` text,
`ns_include` tinyint(0) NOT NULL default 0,
`ns_include` tinyint(4) NOT NULL default '0',
PRIMARY KEY (`name`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1;
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment