[dw-free] Support fdata.bml

[mark]

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

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

Move /edges to /data/edges on user subdomains.

Patch by exor674.

Files modified:

• cgi-bin/Apache/LiveJournal.pm
• cgi-bin/ljlib.pl

--------------------------------------------------------------------------------
diff -r 89878cce1e71 -r e81adb64800f cgi-bin/Apache/LiveJournal.pm
--- a/cgi-bin/Apache/LiveJournal.pm	Wed Sep 09 23:07:11 2009 +0000
+++ b/cgi-bin/Apache/LiveJournal.pm	Wed Sep 09 23:41:27 2009 +0000
@@ -617,11 +617,6 @@ sub trans
             return $bml_handler->( "$LJ::HOME/htdocs/allpics.bml" );
         }
 
-        if ( $opts->{mode} eq "edges" ) {
-            $r->notes->{_journal} = $opts->{user};
-            return $bml_handler->( "$LJ::HOME/htdocs/data/edges.bml" );
-        }
-
         %RQ = %$opts;
 
         if ($opts->{mode} eq "data" && $opts->{pathextra} =~ m!^/(\w+)(/.*)?!) {
@@ -630,6 +625,12 @@ sub trans
             return remote_domsess_bounce() if LJ::remote_bounce_url();
 
             my ($mode, $path) = ($1, $2);
+
+            if ( $mode eq "edges" ) {
+                $r->notes->{_journal} = $opts->{user};
+                return $bml_handler->( "$LJ::HOME/htdocs/data/edges.bml" );
+            }
+
             if ($mode eq "customview") {
                 $r->handler("perl-script");
                 $r->push_handlers(PerlResponseHandler => \&customview_content);
diff -r 89878cce1e71 -r e81adb64800f cgi-bin/ljlib.pl
--- a/cgi-bin/ljlib.pl	Wed Sep 09 23:07:11 2009 +0000
+++ b/cgi-bin/ljlib.pl	Wed Sep 09 23:41:27 2009 +0000
@@ -182,7 +182,6 @@ LJ::MemCache::init();
                  "icons" => {
                     "des" => "Icons",
                  },
-                 edges => { des => 'Edges', },
                  );
 
 ## we want to set this right away, so when we get a HUP signal later
--------------------------------------------------------------------------------