diff --git a/core/lib/Foswiki/Config/Node.pm b/core/lib/Foswiki/Config/Node.pm index c14511e4e8..c475e96367 100644 --- a/core/lib/Foswiki/Config/Node.pm +++ b/core/lib/Foswiki/Config/Node.pm @@ -166,7 +166,7 @@ my %types = ( # Resets only if leafState is undef. This will enforce re-check for the # attribute. -sub _reset_leafState { +sub _recheck_leafState { my $this = shift; $this->clear_leafState unless $this->has_leafState && defined $this->leafState; @@ -188,7 +188,7 @@ sub setLeafState { $this->leafState( $state ? LEAF : BRANCH ); } else { - $this->_reset_leafState; + $this->_recheck_leafState; } } @@ -202,7 +202,7 @@ Returns true if node is a leaf. sub isLeaf { my $this = shift; - $this->_reset_leafState; + $this->_recheck_leafState; return defined $this->leafState && $this->leafState == LEAF; } @@ -216,7 +216,7 @@ Returns true if node is a branch. sub isBranch { my $this = shift; - $this->_reset_leafState; + $this->_recheck_leafState; return defined $this->leafState && $this->leafState == BRANCH; } @@ -254,7 +254,7 @@ sub setOpt_type { my ( $opt, $val ) = @_; Foswiki::Exception::Config::BadSpecData->throw( - text => "Node type is not defined", + text => "Node type can not be undefined", nodeObject => $this, ) unless defined $val; diff --git a/core/lib/Foswiki/Config/Spec/File.pm b/core/lib/Foswiki/Config/Spec/File.pm index a53850a9bc..920844ec4c 100644 --- a/core/lib/Foswiki/Config/Spec/File.pm +++ b/core/lib/Foswiki/Config/Spec/File.pm @@ -163,8 +163,8 @@ pluggable parse => sub { # We'd rather ignore any caching error. If specs cannot be # cached then go away with it and recall the parser for every # invocation. - # SMELL Replace warn with bufferizing messaging when it's ready. - warn "Cannot clone specs for caching: " . $e; + # SMELL Replace warn with bufferized messaging when it's ready. + warn "Cannot cache specs: " . $e; }; }