Skip to content

Commit

Permalink
Item8960: uninitialised var in UI::Changes - remove another remainin…
Browse files Browse the repository at this point in the history
…g REPEAT split

git-svn-id: http://svn.foswiki.org/trunk@7292 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
SvenDowideit authored and SvenDowideit committed Apr 30, 2010
1 parent 27fef26 commit 4d5bc53
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
4 changes: 3 additions & 1 deletion PatternSkin/templates/changes.pattern.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@
%TMPL:DEF{"topicinfo"}%%TMPL:END%


%TMPL:DEF{"content"}%<div class="patternSearchResults">%TMPL:P{"header"}%%REPEAT%%TMPL:P{"result"}%%REPEAT%</div><!--/patternSearchResults-->%TMPL:END%
%TMPL:DEF{"CHANGES:header"}%<div class="patternSearchResults">%TMPL:P{"header"}%%TMPL:END%
%TMPL:DEF{CHANGES:format}%%TMPL:P{"result"}%%TMPL:END%
%TMPL:DEF{CHANGES:footer}%</div><!--/patternSearchResults-->%TMPL:END%
9 changes: 8 additions & 1 deletion core/lib/Foswiki/UI/Changes.pm
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,16 @@ sub changes {
Foswiki::UI::checkWebExists( $session, $webObject->web, 'find changes in' );

my $text = $session->templates->readTemplate('changes');

my ( $page, $eachChange, $after ) = split( /%REPEAT%/, $text );

if (!defined($after)) {
#the new, non %REPEAT tmpl definition from foswiki 1.1
$page = $session->templates->expandTemplate('CHANGE:header');
$eachChange = $session->templates->expandTemplate('CHANGE:format');
$after = $session->templates->expandTemplate('CHANGE:footer');
}


my $showMinor = $query->param('minor');
unless ($showMinor) {
my $comment =
Expand Down
9 changes: 4 additions & 5 deletions core/templates/changes.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,8 @@

%TMPL:DEF{"topicactionbuttons"}% Subscribe or unsubscribe in %NOTIFYTOPIC% %TMPL:END%

%TMPL:P{"topicinfo"}%%TMPL:END%

%TMPL:DEF{"searchbody"}%<br />%TMPL:P{"repeatedsearchblock"}%%TMPL:END%


%TMPL:DEF{"content"}%%TMPL:P{"searchbody"}%
%TMPL:P{"topicinfo"}%%TMPL:END%
%TMPL:DEF{"CHANGES:header"}%%TMPL:DEF{"SEARCH:header"}%%TMPL:END%
%TMPL:DEF{CHANGES:format}%%TMPL:DEF{"SEARCH:format"}%%TMPL:END%
%TMPL:DEF{CHANGES:footer}%%TMPL:DEF{"SEARCH:footer"}%%TMPL:END%

0 comments on commit 4d5bc53

Please sign in to comment.