[dw-free] Change 14+ flag to a NSFW flag and allow optional interstitials

[mark]

[commit: http://hg.dwscoalition.org/dw-free/rev/aca1dde2e48b]

http://bugs.dwscoalition.org/show_bug.cgi?id=561

Fix warning with memcache interaction.

Patch by janinedog.

Files modified:

• cgi-bin/DW/Logic/AdultContent.pm

--------------------------------------------------------------------------------
diff -r 6f8927457c6f -r aca1dde2e48b cgi-bin/DW/Logic/AdultContent.pm
--- a/cgi-bin/DW/Logic/AdultContent.pm	Tue Apr 21 06:55:54 2009 +0000
+++ b/cgi-bin/DW/Logic/AdultContent.pm	Tue Apr 21 07:20:07 2009 +0000
@@ -167,8 +167,12 @@ sub _memcache_key {
 sub _memcache_key {
     my ( $class, $u ) = @_;
 
-    my $confirm_id = LJ::isu( $u ) ? $u->id : LJ::UniqCookie->current_uniq;
-    return [ $confirm_id, "confirmedadult:$confirm_id" ];
+    my $key = "confirmedadult:";
+
+    return [ $u->id, $key . $u->id ]
+        if LJ::isu( $u );
+
+    return $key . LJ::UniqCookie->current_uniq;
 }
 
 sub confirmed_pages {
--------------------------------------------------------------------------------