[dw-free] sitefeeds style stylesheet not being applied

[fu]

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

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

If we have no styleid (special styles, ones built up manually and not owned
by anyone), treat them specially -- let the logic fall through to them so
they can use their own stylesheets.

Patch by fu.

Files modified:

• cgi-bin/LJ/User.pm

--------------------------------------------------------------------------------
diff -r 8fe402073236 -r ea4f943ae4e9 cgi-bin/LJ/User.pm
--- a/cgi-bin/LJ/User.pm	Thu Jul 29 09:53:05 2010 -0500
+++ b/cgi-bin/LJ/User.pm	Thu Jul 29 09:11:29 2010 -0700
@@ -8423,7 +8423,9 @@ sub make_journal {
             }
 
             # resource URLs have the styleid in it
-            if ($view eq "res" && $opts->{'pathextra'} =~ m!^/(\d+)/!) {
+            # unless they're a special style, like sitefeeds (which have no styleid)
+            # in which case, let them fall through. Something else will handle it
+            if ( $view eq "res" && $opts->{'pathextra'} =~ m!^/(\d+)/! && $1 ) {
                 return (2, $1);
             }
 
--------------------------------------------------------------------------------

Comments

[ninetydegrees]

Afuna, is this supposed to have fixed all display issues? I'm asking because all feed layouts look completely wonky right now (see http://xkcd-feed.dreamwidth.org/ for example) and I'm not sure whether to report it.
It looks like one-column was forced onto Skittlish Dreams, which is one of the few remaining layouts which doesn't support it.

[kareila]

Feeds were supposed to be using a completely new system layout, which doesn't appear to have worked - so that's the issue you're seeing. (And yes, I see it too.)

[ninetydegrees]

Thank you, Jen. I thought this change fixed it. :/

[fu]

It was supposed to! I was rushing to go to the airport though and missed committing the other half of the changes. I am nearly home and can fix this once I get there, with less rush :)

Fu, the amazing international dev!

[ninetydegrees]

Development from the future! Commit one half of your patch on one continent but wait till you're on another one to commit the rest! Aha!

:P

Re: Fu, the amazing international dev!

[afuna]

I know! The internet is awesome *G*