[interchange-cvs] interchange - danb modified lib/Vend/Util.pm

[interchange-core@icdevgroup.org]

User:      danb
Date:      2002-10-05 23:57:10 GMT
Modified:  lib/Vend Util.pm
Log:
 * Minor correction to *really* enable 'no_count' (per prior commit)
 * && -> and (for readability and consistency with code block)

Revision  Changes    Path
2.38      +4 -4      interchange/lib/Vend/Util.pm


rev 2.38, prev_rev 2.37
Index: Util.pm
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/lib/Vend/Util.pm,v
retrieving revision 2.37
retrieving revision 2.38
diff -u -r2.37 -r2.38
--- Util.pm	5 Oct 2002 05:26:29 -0000	2.37
+++ Util.pm	5 Oct 2002 23:57:10 -0000	2.38
@@ -1,6 +1,6 @@
 # Vend::Util - Interchange utility functions
 #
-# $Id: Util.pm,v 2.37 2002/10/05 05:26:29 mheins Exp $
+# $Id: Util.pm,v 2.38 2002/10/05 23:57:10 danb Exp $
 #=20
 # Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
 #
@@ -83,7 +83,7 @@
 use Safe;
 use subs qw(logError logGlobal);
 use vars qw($VERSION @EXPORT @EXPORT_OK);
-$VERSION =3D substr(q$Revision: 2.37 $, 10);
+$VERSION =3D substr(q$Revision: 2.38 $, 10);
=20
 BEGIN {
 	eval {
@@ -1280,9 +1280,9 @@
=20
 	my($id, $ct);
 	$id =3D $Vend::SessionID
-		unless $can_cache and $Vend::Cookie && $opt->{no_session_id};
+		unless $can_cache and $Vend::Cookie and $opt->{no_session_id};
 	$ct =3D ++$Vend::Session->{pageCount}
-		unless $can_cache and $::Scratch->{mv_no_count};
+		unless $can_cache and $opt->{no_count};
=20
 	if($opt->{match_security}) {
 		$opt->{secure} =3D $CGI::secure;