Committer: ailyin
LJSUP-13770 (refactor LJ FAQs from BML to controllers): merging in the branch_U trunk/ U trunk/bin/upgrading/en_LJ.dat U trunk/cgi-bin/LJ/Router.pm
Property changes on: trunk ___________________________________________________________________ Modified: svn:mergeinfo - /branches/mobile:10279-10711 /branches/oauth:8215-9310 + /branches/faq-refactor:12682-12702 /branches/mobile:10279-10711 /branches/oauth:8215-9310 Modified: trunk/bin/upgrading/en_LJ.dat =================================================================== --- trunk/bin/upgrading/en_LJ.dat 2012-09-28 09:20:56 UTC (rev 12702) +++ trunk/bin/upgrading/en_LJ.dat 2012-09-28 09:31:00 UTC (rev 12703) @@ -12751,6 +12751,8 @@ sup_sponsored.status_change.U_to_U.subject|staleness=1 sup_sponsored.status_change.U_to_U.subject=[[sitename]] Sponsorship Status Change +support.faqlist.title=FAQ + talk.answer=Reply talk.asvkontakte|staleness=1 Modified: trunk/cgi-bin/LJ/Router.pm =================================================================== --- trunk/cgi-bin/LJ/Router.pm 2012-09-28 09:20:56 UTC (rev 12702) +++ trunk/cgi-bin/LJ/Router.pm 2012-09-28 09:31:00 UTC (rev 12703) @@ -20,6 +20,7 @@ use LJ::Router::ADV; use LJ::Router::CVK; use LJ::Router::Inbox; +use LJ::Support::Router; my @routers = qw( LJ::Journal::Router @@ -40,6 +41,7 @@ LJ::Router::ADV LJ::Router::CVK LJ::Router::Inbox + LJ::Support::Router ); sub match_controller {