[TWiki-Dev] CVS: twiki/lib/TWiki/UI RDiff.pm,1.3,1.4

[sven d. <sv...@us...>]

Update of /cvsroot/twiki/twiki/lib/TWiki/UI
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1672

Modified Files:
	RDiff.pm 
Log Message:
added variables for TWikiPreferences
TWikiFormsDiffRendering


Index: RDiff.pm
===================================================================
RCS file: /cvsroot/twiki/twiki/lib/TWiki/UI/RDiff.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** RDiff.pm	9 May 2004 07:33:15 -0000	1.3
--- RDiff.pm	9 May 2004 12:31:49 -0000	1.4
***************
*** 367,373 ****
--- 367,376 ----
  
    my $renderStyle = $query->param('render');
+   $renderStyle = &TWiki::Prefs::getPreferencesValue( "DIFFRENDERSTYLE" ) unless ( $renderStyle );
    my $diffType = $query->param('type');
    my $contextLines = $query->param('context');
+   $contextLines = &TWiki::Prefs::getPreferencesValue( "DIFFCONTEXTLINES" ) unless ( $contextLines );
    my $skin = $query->param( "skin" );
+   $skin = &TWiki::Prefs::getPreferencesValue( "SKIN" ) unless ( $skin );
    my $rev1 = $query->param( "rev1" );
    my $rev2 = $query->param( "rev2" );
***************
*** 391,396 ****
    my $scriptUrlPath = $TWiki::scriptUrlPath;
  
-   # get view template, standard view or a view with a different skin
-   $skin = &TWiki::Prefs::getPreferencesValue( "SKIN" ) unless ( $skin );
    $tmpl = &TWiki::Store::readTemplate( "rdiff", $skin );
    $tmpl =~ s/\%META{.*?}\%//go;  # remove %META{"parent"}%
--- 394,397 ----