[dw-free] Reading page uses journal-wide adult content setting for displaying NSFW/18+ icons

[afuna]

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

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

Use the journal-wide settings of the journal this entry was posted in, not
the journal we were viewing (should only affect read page)

Patch by wyntarvox.

Files modified:

• cgi-bin/LJ/S2.pm

--------------------------------------------------------------------------------
diff -r 323355b5c882 -r 5086f0e86f60 cgi-bin/LJ/S2.pm
--- a/cgi-bin/LJ/S2.pm	Mon Nov 23 16:46:54 2009 +0000
+++ b/cgi-bin/LJ/S2.pm	Mon Nov 23 16:54:20 2009 +0000
@@ -1959,7 +1959,7 @@ sub Entry_from_entryobj
         dateparts => $alldatepart,
         system_dateparts => $system_alldatepart,
         security => $security,
-        adult_content_level => $entry_obj->adult_content_calculated || $u->adult_content_calculated,
+        adult_content_level => $entry_obj->adult_content_calculated || $journal->adult_content_calculated,
         allowmask => $allowmask,
         props => $entry_obj->props,
         itemid => $ditemid,
--------------------------------------------------------------------------------