From svnnotify ¡÷ sourceforge.jp Mon Mar 2 19:43:57 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 02 Mar 2009 19:43:57 +0900 Subject: [Slashdotjp-dev 1516] [1047] add to get spinner2.gif forcely Message-ID: <1235990637.236951.24628.nullmailer@users.sourceforge.jp> Revision: 1047 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1047 Author: tach Date: 2009-03-02 19:43:57 +0900 (Mon, 02 Mar 2009) Log Message: ----------- add to get spinner2.gif forcely Modified Paths: -------------- images/trunk/Makefile Added Paths: ----------- images/trunk/spinner2.gif -------------- next part -------------- Modified: images/trunk/Makefile =================================================================== --- images/trunk/Makefile 2009-02-27 06:45:13 UTC (rev 1046) +++ images/trunk/Makefile 2009-03-02 10:43:57 UTC (rev 1047) @@ -19,6 +19,7 @@ sed -e 's/\.pnh$$/.png/' | \ sort -u | \ wget --no-proxy --no-host-directories --mirror --no-verbose -i - + wget --no-proxy --no-verbose http://images.slashdot.org/spinner2.gif touch images-stamp css/slashcode_lite.css css/slashcode_low_bw.css css/iestyles.css css/admin.css css/comments.css css/firehose.css css/ie6.css css/ie7.css: %: %.orig %.jp Added: images/trunk/spinner2.gif =================================================================== (Binary files differ) Property changes on: images/trunk/spinner2.gif ___________________________________________________________________ Added: svn:mime-type + application/octet-stream From svnnotify ¡÷ sourceforge.jp Mon Mar 2 19:45:24 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 02 Mar 2009 19:45:24 +0900 Subject: [Slashdotjp-dev 1517] [1048] fix typo Message-ID: <1235990724.662892.26375.nullmailer@users.sourceforge.jp> Revision: 1048 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1048 Author: tach Date: 2009-03-02 19:45:24 +0900 (Mon, 02 Mar 2009) Log Message: ----------- fix typo Modified Paths: -------------- images/trunk/Makefile images/trunk/all-minified.js -------------- next part -------------- Modified: images/trunk/Makefile =================================================================== --- images/trunk/Makefile 2009-03-02 10:43:57 UTC (rev 1047) +++ images/trunk/Makefile 2009-03-02 10:45:24 UTC (rev 1048) @@ -87,6 +87,7 @@ sed -e 's/hidden comment> $@ echo >> $@ if [ -f $@.jp ]; then cat $@.jp >> $@; fi Modified: images/trunk/all-minified.js =================================================================== --- images/trunk/all-minified.js 2009-03-02 10:43:57 UTC (rev 1047) +++ images/trunk/all-minified.js 2009-03-02 10:45:24 UTC (rev 1048) @@ -1543,7 +1543,7 @@ var firehose_cal_select_handler=function(type,args,obj){var selected=args[0];firehose_settings.issue='';firehose_set_options('startdate',selected.startdate);firehose_set_options('duration',selected.duration);};function firehose_calendar_init(widget){widget.changeEvent.subscribe(firehose_cal_select_handler,widget,true);} function firehose_slider_init(){if(!fh_slider_init_set){fh_colorslider=YAHOO.widget.Slider.getHorizSlider("colorsliderbg","colorsliderthumb",0,105,fh_ticksize);var fh_set_val_return=fh_colorslider.setValue(fh_ticksize*fh_colors_hash[fh_color],1);var fh_get_val_return=fh_colorslider.getValue();fh_colorslider.subscribe("slideEnd",firehose_slider_end);}} function firehose_slider_end(offsetFromStart){var newVal=Math.round(fh_colorslider.getValue());if(newVal){fh_slider_init_set=1;} -var color=fh_colors[newVal/fh_ticksize];if(color!==undefined){$dom('fh_slider_img').title="Firehose filtered to "+color;if(fh_slider_init_set){firehose_set_options("color",color);}}else if(firehohse_settings.color!==undefined){firehose_slider_set_color(firehose_settings.color);}} +var color=fh_colors[newVal/fh_ticksize];if(color!==undefined){$dom('fh_slider_img').title="Firehose filtered to "+color;if(fh_slider_init_set){firehose_set_options("color",color);}}else if(firehose_settings.color!==undefined){firehose_slider_set_color(firehose_settings.color);}} function firehose_slider_set_color(color){fh_colorslider.setValue(fh_ticksize*fh_colors_hash[color],1);} function firehose_change_section_anon(section){window.location.href=window.location.protocol+"//"+window.location.host+"/firehose.pl?section="+encodeURIComponent(section)+"&tabtype=tabsection";} function pausePopVendorStory(id){vendor_popup_id=id;closePopup('vendorStory-26-popup');vendor_popup_timerids[id]=setTimeout(vendorStoryPopup,500);} From svnnotify ¡÷ sourceforge.jp Mon Mar 2 20:51:56 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 02 Mar 2009 20:51:56 +0900 Subject: [Slashdotjp-dev 1518] [1049] remove green body bottom border Message-ID: <1235994716.194468.12993.nullmailer@users.sourceforge.jp> Revision: 1049 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1049 Author: tach Date: 2009-03-02 20:51:56 +0900 (Mon, 02 Mar 2009) Log Message: ----------- remove green body bottom border Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-03-02 10:45:24 UTC (rev 1048) +++ images/trunk/css/slashdotjp.css 2009-03-02 11:51:56 UTC (rev 1049) @@ -7,6 +7,7 @@ font-size: 98%; line-height: 1.3; min-width: 750px; + border-bottom: 0; } div#topnav, div.copyright { From svnnotify ¡÷ sourceforge.jp Tue Mar 3 13:39:41 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 03 Mar 2009 13:39:41 +0900 Subject: [Slashdotjp-dev 1519] [1050] enable SSI on firehose.shtml for slashdot.jp (#15380) Message-ID: <1236055181.475523.21148.nullmailer@users.sourceforge.jp> Revision: 1050 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1050 Author: tach Date: 2009-03-03 13:39:41 +0900 (Tue, 03 Mar 2009) Log Message: ----------- enable SSI on firehose.shtml for slashdot.jp (#15380) Ticket Links: :----------- http://sourceforge.jp/projects/slashdotjp/tracker/detail/15380 Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/themes/slashcode/tasks/freshenup.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-02 11:51:56 UTC (rev 1049) +++ slashjp/trunk/debian/changelog 2009-03-03 04:39:41 UTC (rev 1050) @@ -29,8 +29,9 @@ * Fix: userInfo comment link from "journal" to "story" when kinds are "journal-story" * setCurrentForm('ssi', 1) when creating "slashfoot.inc" + * enable SSI on firehose.shtml for slashdot.jp - -- Taku YASUI Fri, 27 Feb 2009 06:34:17 +0000 + -- Taku YASUI Tue, 3 Mar 2009 04:39:16 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/themes/slashcode/tasks/freshenup.pl =================================================================== --- slashjp/trunk/themes/slashcode/tasks/freshenup.pl 2009-03-02 11:51:56 UTC (rev 1049) +++ slashjp/trunk/themes/slashcode/tasks/freshenup.pl 2009-03-03 04:39:41 UTC (rev 1050) @@ -607,6 +607,7 @@ my($vu, $filename, $section, $skinname, $opts) = @_; my $constants = getCurrentStatic(); my $fargs = "virtual_user=$vu taskgen=1 section='$section'"; + $fargs .= " ssi=1"; # enable SSI on firehose.shtml for slashdot.jp (2009-03-03, tach) my $basedir = $constants->{basedir}; $skinname .= "/" if $skinname; From svnnotify ¡÷ sourceforge.jp Tue Mar 3 14:45:06 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 03 Mar 2009 14:45:06 +0900 Subject: [Slashdotjp-dev 1520] [1051] * Fix: /firehose.pl:Slash::Utility::Display:/usr/lib/perl5/Slash/ Utility/Display.pm:526:cannot Message-ID: <1236059106.450016.6808.nullmailer@users.sourceforge.jp> Revision: 1051 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1051 Author: tach Date: 2009-03-03 14:45:06 +0900 (Tue, 03 Mar 2009) Log Message: ----------- * Fix: /firehose.pl:Slash::Utility::Display:/usr/lib/perl5/Slash/Utility/Display.pm:526:cannot getSkin for empty skid ;; Which was called by:Slash::FireHose:/usr/share/perl5/Slash/FireHose.pm:3321 Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/FireHose/FireHose.pm -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-03 04:39:41 UTC (rev 1050) +++ slashjp/trunk/debian/changelog 2009-03-03 05:45:06 UTC (rev 1051) @@ -30,8 +30,11 @@ "journal-story" * setCurrentForm('ssi', 1) when creating "slashfoot.inc" * enable SSI on firehose.shtml for slashdot.jp + * Fix: /firehose.pl:Slash::Utility::Display:/usr/lib/perl5/Slash/Utility/Display.pm:526:cannot + getSkin for empty skid ;; Which was called + by:Slash::FireHose:/usr/share/perl5/Slash/FireHose.pm:3321 - -- Taku YASUI Tue, 3 Mar 2009 04:39:16 +0000 + -- Taku YASUI Tue, 3 Mar 2009 05:44:33 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/plugins/FireHose/FireHose.pm =================================================================== --- slashjp/trunk/plugins/FireHose/FireHose.pm 2009-03-03 04:39:41 UTC (rev 1050) +++ slashjp/trunk/plugins/FireHose/FireHose.pm 2009-03-03 05:45:06 UTC (rev 1051) @@ -3322,7 +3322,7 @@ sid => $story->{sid}, link => $story->{title}, tid => $story->{tid}, - skin => $story->{primaryskid} + skin => $story->{primaryskid} || $constants->{mainpage_skid}, }, 0); $link_url = $story_link_ar->[0]; } elsif ($item->{type} eq "journal") { From svnnotify ¡÷ sourceforge.jp Tue Mar 3 16:33:02 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 03 Mar 2009 16:33:02 +0900 Subject: [Slashdotjp-dev 1521] [1052] Fix firehose story link useless use of shtml Message-ID: <1236065582.063425.13567.nullmailer@users.sourceforge.jp> Revision: 1052 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1052 Author: tach Date: 2009-03-03 16:33:02 +0900 (Tue, 03 Mar 2009) Log Message: ----------- Fix firehose story link useless use of shtml Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/FireHose/FireHose.pm -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-03 05:45:06 UTC (rev 1051) +++ slashjp/trunk/debian/changelog 2009-03-03 07:33:02 UTC (rev 1052) @@ -33,8 +33,9 @@ * Fix: /firehose.pl:Slash::Utility::Display:/usr/lib/perl5/Slash/Utility/Display.pm:526:cannot getSkin for empty skid ;; Which was called by:Slash::FireHose:/usr/share/perl5/Slash/FireHose.pm:3321 + * Fix firehose story link useless use of shtml - -- Taku YASUI Tue, 3 Mar 2009 05:44:33 +0000 + -- Taku YASUI Tue, 3 Mar 2009 07:31:29 +0000 slash (2.5.0.233-4) unstable; urgency=low Modified: slashjp/trunk/plugins/FireHose/FireHose.pm =================================================================== --- slashjp/trunk/plugins/FireHose/FireHose.pm 2009-03-03 05:45:06 UTC (rev 1051) +++ slashjp/trunk/plugins/FireHose/FireHose.pm 2009-03-03 07:33:02 UTC (rev 1052) @@ -1942,6 +1942,7 @@ sub dispFireHose { my($self, $item, $options) = @_; my $constants = getCurrentStatic(); + my $user = getCurrentUser(); $options ||= {}; my $mcd = $self->getMCD(); my $mcdkey; @@ -1967,7 +1968,7 @@ view_mode => $options->{view_mode} }, { Page => "firehose", Return => 1 }); - if ($mcd) { + if (!$user->{is_anon} && $mcd) { $mcdkey = $self->genFireHoseMCDKey($item->{id}, $options); if ($mcdkey) { my $exptime = $constants->{firehose_memcached_disp_exptime} || 180; From svnnotify ¡÷ sourceforge.jp Tue Mar 3 17:02:54 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 03 Mar 2009 17:02:54 +0900 Subject: [Slashdotjp-dev 1522] [1053] [svn-buildpackage] Tagging slash (2.5.0.233-5) Message-ID: <1236067374.187866.18086.nullmailer@users.sourceforge.jp> Revision: 1053 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1053 Author: tach Date: 2009-03-03 17:02:54 +0900 (Tue, 03 Mar 2009) Log Message: ----------- [svn-buildpackage] Tagging slash (2.5.0.233-5) Added Paths: ----------- slashjp/tags/2.5.0.233-5/ -------------- next part -------------- From svnnotify ¡÷ sourceforge.jp Tue Mar 3 17:47:34 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 03 Mar 2009 17:47:34 +0900 Subject: [Slashdotjp-dev 1523] [1054] increase debian version Message-ID: <1236070054.179755.32348.nullmailer@users.sourceforge.jp> Revision: 1054 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1054 Author: tach Date: 2009-03-03 17:47:34 +0900 (Tue, 03 Mar 2009) Log Message: ----------- increase debian version Modified Paths: -------------- slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-03 08:02:54 UTC (rev 1053) +++ slashjp/trunk/debian/changelog 2009-03-03 08:47:34 UTC (rev 1054) @@ -1,3 +1,9 @@ +slash (2.5.0.233-6) unstable; urgency=low + + * NOT RELEASED YET + + -- Taku YASUI Tue, 3 Mar 2009 08:47:03 +0000 + slash (2.5.0.233-5) unstable; urgency=low * Fix to change discussion dkid for "journal-story" From svnnotify ¡÷ sourceforge.jp Tue Mar 3 20:28:40 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 03 Mar 2009 20:28:40 +0900 Subject: [Slashdotjp-dev 1524] [1055] Change journal prev-next order Message-ID: <1236079720.856957.19588.nullmailer@users.sourceforge.jp> Revision: 1055 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1055 Author: tach Date: 2009-03-03 20:28:40 +0900 (Tue, 03 Mar 2009) Log Message: ----------- Change journal prev-next order Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Journal/journal.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-03 08:47:34 UTC (rev 1054) +++ slashjp/trunk/debian/changelog 2009-03-03 11:28:40 UTC (rev 1055) @@ -1,8 +1,8 @@ slash (2.5.0.233-6) unstable; urgency=low - * NOT RELEASED YET + * Change journal prev-next order - -- Taku YASUI Tue, 3 Mar 2009 08:47:03 +0000 + -- Taku YASUI Tue, 3 Mar 2009 11:28:12 +0000 slash (2.5.0.233-5) unstable; urgency=low Modified: slashjp/trunk/plugins/Journal/journal.pl =================================================================== --- slashjp/trunk/plugins/Journal/journal.pl 2009-03-03 08:47:34 UTC (rev 1054) +++ slashjp/trunk/plugins/Journal/journal.pl 2009-03-03 11:28:40 UTC (rev 1055) @@ -559,8 +559,8 @@ $commentcount = $article->[6] ? $discussion->{commentcount} : 0; - $prev = $journal_reader->getJournalByTime('>', $article, { uid => $uid }); - $next = $journal_reader->getJournalByTime('<', $article, { uid => $uid }); + $prev = $journal_reader->getJournalByTime('<', $article, { uid => $uid }); + $next = $journal_reader->getJournalByTime('>', $article, { uid => $uid }); } else { $commentcount = $article->[6] ? $journal_reader->getDiscussion($article->[6], 'commentcount') From svnnotify ¡÷ sourceforge.jp Sat Mar 7 09:54:21 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Sat, 07 Mar 2009 09:54:21 +0900 Subject: [Slashdotjp-dev 1525] [1056] fix footer ads misalignment Message-ID: <1236387261.599545.32172.nullmailer@users.sourceforge.jp> Revision: 1056 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1056 Author: tach Date: 2009-03-07 09:54:21 +0900 (Sat, 07 Mar 2009) Log Message: ----------- fix footer ads misalignment Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-03-03 11:28:40 UTC (rev 1055) +++ images/trunk/css/slashdotjp.css 2009-03-07 00:54:21 UTC (rev 1056) @@ -473,6 +473,7 @@ margin: 0; padding: 0; border: 0; + vertical-align: top; } /* FAQ page navigation */ From svnnotify ¡÷ sourceforge.jp Tue Mar 10 12:25:15 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 10 Mar 2009 12:25:15 +0900 Subject: [Slashdotjp-dev 1526] [1057] allow firehose.pl, hof.pl and submit.pl Message-ID: <1236655515.549172.29879.nullmailer@users.sourceforge.jp> Revision: 1057 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1057 Author: tach Date: 2009-03-10 12:25:15 +0900 (Tue, 10 Mar 2009) Log Message: ----------- allow firehose.pl, hof.pl and submit.pl Modified Paths: -------------- images/trunk/robots.txt -------------- next part -------------- Modified: images/trunk/robots.txt =================================================================== --- images/trunk/robots.txt 2009-03-07 00:54:21 UTC (rev 1056) +++ images/trunk/robots.txt 2009-03-10 03:25:15 UTC (rev 1057) @@ -15,8 +15,6 @@ Disallow: /blob.pl Disallow: /bookmark.pl Disallow: /fileadmin.pl -Disallow: /firehose.pl -Disallow: /hof.pl Disallow: /login.pl Disallow: /messages.pl Disallow: /metamod.pl @@ -24,7 +22,6 @@ Disallow: /relocate.pl Disallow: /slashdot-it.pl Disallow: /stats.pl -Disallow: /submit.pl Disallow: /tags.pl Disallow: /users.pl Disallow: /zoo.pl From svnnotify ¡÷ sourceforge.jp Tue Mar 10 18:42:54 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 10 Mar 2009 18:42:54 +0900 Subject: [Slashdotjp-dev 1527] [1058] Add getJournal() to MySQL.pm for SearchEst2 Message-ID: <1236678174.237125.6082.nullmailer@users.sourceforge.jp> Revision: 1058 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1058 Author: tach Date: 2009-03-10 18:42:54 +0900 (Tue, 10 Mar 2009) Log Message: ----------- Add getJournal() to MySQL.pm for SearchEst2 Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-03-10 03:25:15 UTC (rev 1057) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-03-10 09:42:54 UTC (rev 1058) @@ -12968,6 +12968,15 @@ } ######################################################## +sub getJournal { + return _genericGet({ + table => 'journals', + table_prime => 'id', + arguments => \@_, + }); +} + +######################################################## sub DESTROY { my($self) = @_; Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-10 03:25:15 UTC (rev 1057) +++ slashjp/trunk/debian/changelog 2009-03-10 09:42:54 UTC (rev 1058) @@ -1,8 +1,9 @@ slash (2.5.0.233-6) unstable; urgency=low * Change journal prev-next order + * Add getJournal() to MySQL.pm for SearchEst2 - -- Taku YASUI Tue, 3 Mar 2009 11:28:12 +0000 + -- Taku YASUI Sun, 8 Mar 2009 16:15:55 +0000 slash (2.5.0.233-5) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Tue Mar 10 18:45:46 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 10 Mar 2009 18:45:46 +0900 Subject: [Slashdotjp-dev 1528] [1059] Add "rdfitem_content_encoded" parameter for Slash/XML/RSS.pm Message-ID: <1236678346.562753.8693.nullmailer@users.sourceforge.jp> Revision: 1059 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1059 Author: tach Date: 2009-03-10 18:45:46 +0900 (Tue, 10 Mar 2009) Log Message: ----------- Add "rdfitem_content_encoded" parameter for Slash/XML/RSS.pm Modified Paths: -------------- slashjp/trunk/Slash/XML/RSS/RSS.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/XML/RSS/RSS.pm =================================================================== --- slashjp/trunk/Slash/XML/RSS/RSS.pm 2009-03-10 09:42:54 UTC (rev 1058) +++ slashjp/trunk/Slash/XML/RSS/RSS.pm 2009-03-10 09:45:46 UTC (rev 1059) @@ -164,6 +164,9 @@ $self->{rdfitem_content} = defined $param->{rdfitem_content} ? $param->{rdfitem_content} : $constants->{rdfitem_content}; + $self->{rdfitem_content_encoded} = defined $param->{rdfitem_content_encoded} + ? $param->{rdfitem_content_encoded} + : $constants->{rdfitem_content_encoded}; my $rss = XML::RSS->new( version => $version, @@ -334,7 +337,7 @@ my $desc = $self->rss_item_description($item->{$key}); $encoded_item->{$key} = $desc if $desc; } - } elsif ($key eq 'content:encoded' && $self->{rdfitem_content}) { + } elsif ($key eq 'content:encoded' && $self->{rdfitem_content} && $self->{rdfitem_content_encoded}) { if ($version == 1) { my $rdfitemdesc_html_bak = $self->{rdfitemdesc_html}; $self->{rdfitemdesc_html} = 1; Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-10 09:42:54 UTC (rev 1058) +++ slashjp/trunk/debian/changelog 2009-03-10 09:45:46 UTC (rev 1059) @@ -2,8 +2,9 @@ * Change journal prev-next order * Add getJournal() to MySQL.pm for SearchEst2 + * Add "rdfitem_content_encoded" parameter for Slash/XML/RSS.pm - -- Taku YASUI Sun, 8 Mar 2009 16:15:55 +0000 + -- Taku YASUI Tue, 10 Mar 2009 09:45:15 +0000 slash (2.5.0.233-5) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Tue Mar 10 19:24:46 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 10 Mar 2009 19:24:46 +0900 Subject: [Slashdotjp-dev 1529] [1060] [svn-buildpackage] Tagging slash (2.5.0.233-6) Message-ID: <1236680686.622245.20320.nullmailer@users.sourceforge.jp> Revision: 1060 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1060 Author: tach Date: 2009-03-10 19:24:46 +0900 (Tue, 10 Mar 2009) Log Message: ----------- [svn-buildpackage] Tagging slash (2.5.0.233-6) Added Paths: ----------- slashjp/tags/2.5.0.233-6/ -------------- next part -------------- From svnnotify ¡÷ sourceforge.jp Tue Mar 10 19:25:40 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 10 Mar 2009 19:25:40 +0900 Subject: [Slashdotjp-dev 1530] [1061] increase debian version Message-ID: <1236680740.935979.20820.nullmailer@users.sourceforge.jp> Revision: 1061 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1061 Author: tach Date: 2009-03-10 19:25:40 +0900 (Tue, 10 Mar 2009) Log Message: ----------- increase debian version Modified Paths: -------------- slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-10 10:24:46 UTC (rev 1060) +++ slashjp/trunk/debian/changelog 2009-03-10 10:25:40 UTC (rev 1061) @@ -1,3 +1,9 @@ +slash (2.5.0.233-7) unstable; urgency=low + + * NOT RELEASED YET + + -- Taku YASUI Tue, 10 Mar 2009 10:25:23 +0000 + slash (2.5.0.233-6) unstable; urgency=low * Change journal prev-next order From svnnotify ¡÷ sourceforge.jp Tue Mar 10 20:50:24 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 10 Mar 2009 20:50:24 +0900 Subject: [Slashdotjp-dev 1531] [1062] fix for new search HTML Message-ID: <1236685824.607777.4596.nullmailer@users.sourceforge.jp> Revision: 1062 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1062 Author: tach Date: 2009-03-10 20:50:24 +0900 (Tue, 10 Mar 2009) Log Message: ----------- fix for new search HTML Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-03-10 10:25:40 UTC (rev 1061) +++ images/trunk/css/slashdotjp.css 2009-03-10 11:50:24 UTC (rev 1062) @@ -564,16 +564,22 @@ text-align: right; } -div.search-results, +div.search-result, div.search-help { margin: 1.2em 5px; line-height: 1.5; } -.search-results .intro { - font-size: 80%; +.search-result h4 { + font-size: 110%; } -.search-results .data { + +.search-result .intro { + font-size: 90%; +} + +.search-result .data, +.search-result .section-topics { font-size: 80%; color: #666; } From svnnotify ¡÷ sourceforge.jp Tue Mar 10 22:56:49 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 10 Mar 2009 22:56:49 +0900 Subject: [Slashdotjp-dev 1532] [1063] add hyperestraier icon Message-ID: <1236693409.858366.26733.nullmailer@users.sourceforge.jp> Revision: 1063 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1063 Author: tach Date: 2009-03-10 22:56:49 +0900 (Tue, 10 Mar 2009) Log Message: ----------- add hyperestraier icon Added Paths: ----------- images/trunk/hyperestraier/ images/trunk/hyperestraier/icon16.png -------------- next part -------------- Added: images/trunk/hyperestraier/icon16.png =================================================================== (Binary files differ) Property changes on: images/trunk/hyperestraier/icon16.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream From svnnotify ¡÷ sourceforge.jp Wed Mar 11 17:45:43 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 11 Mar 2009 17:45:43 +0900 Subject: [Slashdotjp-dev 1533] [1064] Fix slow query on getStoryByTime() Message-ID: <1236761143.203263.21282.nullmailer@users.sourceforge.jp> Revision: 1064 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1064 Author: tach Date: 2009-03-11 17:45:43 +0900 (Wed, 11 Mar 2009) Log Message: ----------- Fix slow query on getStoryByTime() Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-03-10 13:56:49 UTC (rev 1063) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-03-11 08:45:43 UTC (rev 1064) @@ -5907,6 +5907,7 @@ my $limit = $options->{limit} || 1; my $topic = $options->{topic} || ''; my $section = $options->{section} || ''; + my $tables = 'stories JOIN story_text USING (stoid)'; my $where; my $name = 'story_by_time'; _genericCacheRefresh($self, $name, $constants->{story_expire} || 600); @@ -5929,6 +5930,7 @@ my $mp_tid = $constants->{mainpage_nexus_tid} || 1; if (!$section && !$topic && $user->{sectioncollapse}) { + $tables .= ' JOIN story_topics_rendered USING (stoid)'; my $nexuses = $self->getNexusChildrenTids($mp_tid); my $nexus_clause = join ',', @$nexuses, $mp_tid; $where .= " AND story_topics_rendered.tid IN ($nexus_clause)"; @@ -5943,7 +5945,11 @@ my $nexus_clause .= join ',', @$nexuses; $where .= " AND (story_topics_rendered.stoid NOT IN (SELECT stoid FROM story_topics_rendered WHERE tid IN ($nexus_clause)) OR story_topics_rendered.tid = $mp_tid)" if ($nexus_clause); + if ($user->{story_never_nexus} || $nexus_clause) { + $tables .= ' JOIN story_topics_rendered USING (stoid)'; + } } else { + $tables .= ' JOIN story_topics_rendered USING (stoid)'; $where .= " AND story_topics_rendered.tid = $mp_tid"; $key .= '|='; } @@ -5979,10 +5985,8 @@ my $returnable = $self->sqlSelectHashref( 'stories.stoid, sid, title, stories.tid', - 'stories, story_text, story_topics_rendered', - "stories.stoid = story_text.stoid - AND stories.stoid = story_topics_rendered.stoid - AND '$time' > DATE_SUB($now, INTERVAL $bytime_delay DAY) + $tables, + "'$time' > DATE_SUB($now, INTERVAL $bytime_delay DAY) AND time $sign '$time' AND time <= $now AND in_trash = 'no' Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-10 13:56:49 UTC (rev 1063) +++ slashjp/trunk/debian/changelog 2009-03-11 08:45:43 UTC (rev 1064) @@ -1,8 +1,8 @@ slash (2.5.0.233-7) unstable; urgency=low - * NOT RELEASED YET + * Fix slow query on getStoryByTime() - -- Taku YASUI Tue, 10 Mar 2009 10:25:23 +0000 + -- Taku YASUI Wed, 11 Mar 2009 08:45:22 +0000 slash (2.5.0.233-6) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Wed Mar 11 17:49:13 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 11 Mar 2009 17:49:13 +0900 Subject: [Slashdotjp-dev 1534] [1065] fix previous commit Message-ID: <1236761353.064962.24815.nullmailer@users.sourceforge.jp> Revision: 1065 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1065 Author: tach Date: 2009-03-11 17:49:13 +0900 (Wed, 11 Mar 2009) Log Message: ----------- fix previous commit Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-03-11 08:45:43 UTC (rev 1064) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-03-11 08:49:13 UTC (rev 1065) @@ -5908,6 +5908,7 @@ my $topic = $options->{topic} || ''; my $section = $options->{section} || ''; my $tables = 'stories JOIN story_text USING (stoid)'; + my $groupby = ''; my $where; my $name = 'story_by_time'; _genericCacheRefresh($self, $name, $constants->{story_expire} || 600); @@ -5931,6 +5932,7 @@ my $mp_tid = $constants->{mainpage_nexus_tid} || 1; if (!$section && !$topic && $user->{sectioncollapse}) { $tables .= ' JOIN story_topics_rendered USING (stoid)'; + $groupby .= 'GROUP BY stories.stoid'; my $nexuses = $self->getNexusChildrenTids($mp_tid); my $nexus_clause = join ',', @$nexuses, $mp_tid; $where .= " AND story_topics_rendered.tid IN ($nexus_clause)"; @@ -5947,9 +5949,11 @@ if ($nexus_clause); if ($user->{story_never_nexus} || $nexus_clause) { $tables .= ' JOIN story_topics_rendered USING (stoid)'; + $groupby .= 'GROUP BY stories.stoid'; } } else { $tables .= ' JOIN story_topics_rendered USING (stoid)'; + $groupby .= 'GROUP BY stories.stoid'; $where .= " AND story_topics_rendered.tid = $mp_tid"; $key .= '|='; } @@ -5991,8 +5995,7 @@ AND time <= $now AND in_trash = 'no' $where", - - "GROUP BY stories.stoid ORDER BY time $order LIMIT $limit" + "$groupby ORDER BY time $order LIMIT $limit" ); # needs to be defined as empty $cache->{$key} = $returnable || '' if $key; From svnnotify ¡÷ sourceforge.jp Wed Mar 11 18:02:28 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 11 Mar 2009 18:02:28 +0900 Subject: [Slashdotjp-dev 1535] [1066] * Remove warning "Use of uninitialized value in int at Message-ID: <1236762148.592361.6527.nullmailer@users.sourceforge.jp> Revision: 1066 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1066 Author: tach Date: 2009-03-11 18:02:28 +0900 (Wed, 11 Mar 2009) Log Message: ----------- * Remove warning "Use of uninitialized value in int at /usr/lib/perl5/Slash/DB/MySQL.pm line 12950." Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-03-11 08:49:13 UTC (rev 1065) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-03-11 09:02:28 UTC (rev 1066) @@ -12947,8 +12947,8 @@ my ($self, $sign, $discussion, $options) = @_; my $constants = getCurrentStatic(); $options = {} if !$options || ref($options) ne 'HASH'; - my $uid = int($options->{uid}) || undef; - my $dkid = int($options->{dkid}) || undef; + my $uid = $options->{uid} ? int($options->{uid}) : undef; + my $dkid = $options->{dkid} ? int($options->{dkid}) : undef; my $where = ''; my $order = $sign eq '<' ? 'DESC' : 'ASC'; Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-11 08:49:13 UTC (rev 1065) +++ slashjp/trunk/debian/changelog 2009-03-11 09:02:28 UTC (rev 1066) @@ -1,8 +1,10 @@ slash (2.5.0.233-7) unstable; urgency=low * Fix slow query on getStoryByTime() + * Remove warning "Use of uninitialized value in int at + /usr/lib/perl5/Slash/DB/MySQL.pm line 12950." - -- Taku YASUI Wed, 11 Mar 2009 08:45:22 +0000 + -- Taku YASUI Wed, 11 Mar 2009 09:01:31 +0000 slash (2.5.0.233-6) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Wed Mar 11 19:14:05 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 11 Mar 2009 19:14:05 +0900 Subject: [Slashdotjp-dev 1536] [1067] add shorten() method to Slash/Utility/Data/Data.pm Message-ID: <1236766445.508092.20534.nullmailer@users.sourceforge.jp> Revision: 1067 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1067 Author: tach Date: 2009-03-11 19:14:05 +0900 (Wed, 11 Mar 2009) Log Message: ----------- add shorten() method to Slash/Utility/Data/Data.pm Modified Paths: -------------- slashjp/trunk/Slash/Utility/Data/Data.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/Utility/Data/Data.pm =================================================================== --- slashjp/trunk/Slash/Utility/Data/Data.pm 2009-03-11 09:02:28 UTC (rev 1066) +++ slashjp/trunk/Slash/Utility/Data/Data.pm 2009-03-11 10:14:05 UTC (rev 1067) @@ -132,6 +132,7 @@ xmlencode_plain validUrl vislenify + shorten ); @@ -4526,7 +4527,43 @@ return ($fudgedurl && $scheme && $allowed_schemes{$scheme}); } +#======================================================================== +=head2 shorten (STRING, LEN) +Shorten given string to given length and add " ... ". + +=over 4 + +=item Parameters + +=over 4 + +=item STRING + +Target string + +=item LEN + +Length to shorten + +=back + +=item Return value + +Shorten string + +=back + +=cut + +sub shorten { + my($str, $len) = @_; + return ($len && length($str) > ($len - 1)) + ? substr($str, 0, $len) . ' ... ' + : $str; +} + + 1; __END__ Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-11 09:02:28 UTC (rev 1066) +++ slashjp/trunk/debian/changelog 2009-03-11 10:14:05 UTC (rev 1067) @@ -3,8 +3,9 @@ * Fix slow query on getStoryByTime() * Remove warning "Use of uninitialized value in int at /usr/lib/perl5/Slash/DB/MySQL.pm line 12950." + * add shorten() method to Slash/Utility/Data/Data.pm - -- Taku YASUI Wed, 11 Mar 2009 09:01:31 +0000 + -- Taku YASUI Wed, 11 Mar 2009 10:13:28 +0000 slash (2.5.0.233-6) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Wed Mar 11 19:51:59 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 11 Mar 2009 19:51:59 +0900 Subject: [Slashdotjp-dev 1537] [1068] Add check for journal_obj->get() argument Message-ID: <1236768719.881331.28143.nullmailer@users.sourceforge.jp> Revision: 1068 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1068 Author: tach Date: 2009-03-11 19:51:59 +0900 (Wed, 11 Mar 2009) Log Message: ----------- Add check for journal_obj->get() argument Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Journal/Journal.pm -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-11 10:14:05 UTC (rev 1067) +++ slashjp/trunk/debian/changelog 2009-03-11 10:51:59 UTC (rev 1068) @@ -4,6 +4,7 @@ * Remove warning "Use of uninitialized value in int at /usr/lib/perl5/Slash/DB/MySQL.pm line 12950." * add shorten() method to Slash/Utility/Data/Data.pm + * Add check for journal_obj->get() argument -- Taku YASUI Wed, 11 Mar 2009 10:13:28 +0000 Modified: slashjp/trunk/plugins/Journal/Journal.pm =================================================================== --- slashjp/trunk/plugins/Journal/Journal.pm 2009-03-11 10:14:05 UTC (rev 1067) +++ slashjp/trunk/plugins/Journal/Journal.pm 2009-03-11 10:51:59 UTC (rev 1068) @@ -19,7 +19,7 @@ my $uid = getCurrentUser('uid'); my $constants = getCurrentStatic(); - return unless $self->sqlSelect('id', 'journals', "uid=$uid AND id=$id"); + return unless ($id && $self->sqlSelect('id', 'journals', "uid=$uid AND id=$id")); my(%j1, %j2); %j1 = %$values; @@ -225,6 +225,7 @@ my($self, $id) = @_; my $uid = getCurrentUser('uid'); + return unless $id; my $journal = $self->get($id); return unless $journal->{uid} == $uid; @@ -809,8 +810,8 @@ if (ref($discussion) eq "HASH") { $discussion = $discussion->{dkid}; } - - return $self->get($self->sqlSelect('id', 'journals', "discussion=$discussion")); + my $id = $self->sqlSelect('id', 'journals', "discussion=$discussion"); + return $id ? $self->get($id) : undef; } sub createJournalUrl { From svnnotify ¡÷ sourceforge.jp Thu Mar 12 11:26:59 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 12 Mar 2009 11:26:59 +0900 Subject: [Slashdotjp-dev 1538] [1069] [svn-buildpackage] Tagging slash (2.5.0.233-7) Message-ID: <1236824819.725131.5953.nullmailer@users.sourceforge.jp> Revision: 1069 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1069 Author: tach Date: 2009-03-12 11:26:59 +0900 (Thu, 12 Mar 2009) Log Message: ----------- [svn-buildpackage] Tagging slash (2.5.0.233-7) Added Paths: ----------- slashjp/tags/2.5.0.233-7/ -------------- next part -------------- From svnnotify ¡÷ sourceforge.jp Thu Mar 12 16:41:53 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 12 Mar 2009 16:41:53 +0900 Subject: [Slashdotjp-dev 1539] [1070] fix search pagination css Message-ID: <1236843713.924808.16091.nullmailer@users.sourceforge.jp> Revision: 1070 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1070 Author: tach Date: 2009-03-12 16:41:53 +0900 (Thu, 12 Mar 2009) Log Message: ----------- fix search pagination css Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-03-12 02:26:59 UTC (rev 1069) +++ images/trunk/css/slashdotjp.css 2009-03-12 07:41:53 UTC (rev 1070) @@ -589,10 +589,48 @@ } #search .pagination { + margin-bottom: 1em; + padding: 0.5em; + background: #EEE; + border: 1px solid #CCC; + border-radius: 10px; + -moz-border-radius: 10px; + text-align: center; font-weight: bold; - margin: 0.9em 0; + width: 100%; } +#search .pagination td { + margin: 0; + padding: 0; + border: 0; + text-align: center; +} + +#search .pagination td.first { + white-space: nowrap; + text-align: left; +} + +#search .pagination td.last { + white-space: nowrap; + text-align: right; +} + +#search .pagination a { + color: #044; + text-decoration: none; + margin: 0 0.5em; +} + +#search .pagination a:hover { + text-decoration: underline; +} + +#search .pagination span.current { + font-size: 120%; +} + /* d1 fix */ #commentlisting.d1 { padding: 0; From svnnotify ¡÷ sourceforge.jp Thu Mar 12 16:43:33 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 12 Mar 2009 16:43:33 +0900 Subject: [Slashdotjp-dev 1540] [1071] add hyperestraier link css Message-ID: <1236843813.614523.18100.nullmailer@users.sourceforge.jp> Revision: 1071 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1071 Author: tach Date: 2009-03-12 16:43:33 +0900 (Thu, 12 Mar 2009) Log Message: ----------- add hyperestraier link css Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-03-12 07:41:53 UTC (rev 1070) +++ images/trunk/css/slashdotjp.css 2009-03-12 07:43:33 UTC (rev 1071) @@ -631,6 +631,11 @@ font-size: 120%; } +#search #hyperestraier { + font-size: 85%; + text-align: center; +} + /* d1 fix */ #commentlisting.d1 { padding: 0; From svnnotify ¡÷ sourceforge.jp Mon Mar 16 13:28:59 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 16 Mar 2009 13:28:59 +0900 Subject: [Slashdotjp-dev 1541] [1072] increase debian version Message-ID: <1237177739.447573.25500.nullmailer@users.sourceforge.jp> Revision: 1072 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1072 Author: tach Date: 2009-03-16 13:28:59 +0900 (Mon, 16 Mar 2009) Log Message: ----------- increase debian version Modified Paths: -------------- slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-12 07:43:33 UTC (rev 1071) +++ slashjp/trunk/debian/changelog 2009-03-16 04:28:59 UTC (rev 1072) @@ -1,3 +1,9 @@ +slash (2.5.0.233-8) unstable; urgency=low + + * NOT RELEASED YET + + -- Taku YASUI Mon, 16 Mar 2009 04:28:28 +0000 + slash (2.5.0.233-7) unstable; urgency=low * Fix slow query on getStoryByTime() From svnnotify ¡÷ sourceforge.jp Mon Mar 16 16:39:30 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 16 Mar 2009 16:39:30 +0900 Subject: [Slashdotjp-dev 1542] [1073] * Add HTML "" into sevaral pages Message-ID: <1237189170.491911.31937.nullmailer@users.sourceforge.jp> Revision: 1073 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1073 Author: tach Date: 2009-03-16 16:39:30 +0900 (Mon, 16 Mar 2009) Log Message: ----------- * Add HTML "" into sevaral pages - article.pl: already inserted, change content to introtext Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/themes/slashcode/htdocs/article.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-16 04:28:59 UTC (rev 1072) +++ slashjp/trunk/debian/changelog 2009-03-16 07:39:30 UTC (rev 1073) @@ -1,9 +1,11 @@ slash (2.5.0.233-8) unstable; urgency=low - * NOT RELEASED YET + * Add HTML "" into sevaral pages + - article.pl: already inserted, change content to introtext - -- Taku YASUI Mon, 16 Mar 2009 04:28:28 +0000 + -- Taku YASUI Mon, 16 Mar 2009 07:36:54 +0000 + slash (2.5.0.233-7) unstable; urgency=low * Fix slow query on getStoryByTime() Modified: slashjp/trunk/themes/slashcode/htdocs/article.pl =================================================================== --- slashjp/trunk/themes/slashcode/htdocs/article.pl 2009-03-16 04:28:59 UTC (rev 1072) +++ slashjp/trunk/themes/slashcode/htdocs/article.pl 2009-03-16 07:39:30 UTC (rev 1073) @@ -147,7 +147,9 @@ my $last = pop @topic_desc; $a = join(', ', @topic_desc) . ", and $last"; } - my $meta_desc = "$story->{title} -- article related to $a."; + my $meta_desc = strip_nohtml($story->{introtext}); + $meta_desc =~ s/[\r\n]//g; + $meta_desc = shorten($meta_desc, 250); header($links, $story->{section}, { story_title => $story->{title}, From svnnotify ¡÷ sourceforge.jp Mon Mar 16 20:36:56 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 16 Mar 2009 20:36:56 +0900 Subject: [Slashdotjp-dev 1543] [1074] * Add HTML "" into sevaral pages Message-ID: <1237203416.736992.18728.nullmailer@users.sourceforge.jp> Revision: 1074 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1074 Author: tach Date: 2009-03-16 20:36:56 +0900 (Mon, 16 Mar 2009) Log Message: ----------- * Add HTML "" into sevaral pages - index.pl: add data "meta_desc" and title of first 5 articles Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/themes/slashcode/htdocs/index.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-16 07:39:30 UTC (rev 1073) +++ slashjp/trunk/debian/changelog 2009-03-16 11:36:56 UTC (rev 1074) @@ -2,10 +2,10 @@ * Add HTML "" into sevaral pages - article.pl: already inserted, change content to introtext + - index.pl: add data "meta_desc" and title of first 5 articles + -- Taku YASUI Mon, 16 Mar 2009 11:36:00 +0000 - -- Taku YASUI Mon, 16 Mar 2009 07:36:54 +0000 - slash (2.5.0.233-7) unstable; urgency=low * Fix slow query on getStoryByTime() Modified: slashjp/trunk/themes/slashcode/htdocs/index.pl =================================================================== --- slashjp/trunk/themes/slashcode/htdocs/index.pl 2009-03-16 07:39:30 UTC (rev 1073) +++ slashjp/trunk/themes/slashcode/htdocs/index.pl 2009-03-16 11:36:56 UTC (rev 1074) @@ -270,6 +270,11 @@ # $user->{currentSection} = $section->{section}; Slash::Utility::Anchor::getSkinColors(); + my $meta_desc = getData('meta_desc'); + foreach my $s (@{$stories}[0 .. 4]) { + $meta_desc .= $slashdb->getStory($s->{stoid}, 'title') . "\x{3002}" if ($s->{stoid}); + } + # displayStories() pops stories off the front of the @$stories array. # Whatever's left is fed to displaySlashboxes for use in the # index_more block (aka Older Stuff). @@ -292,7 +297,7 @@ ); my $title = getData('head', { skin => $skin_name }); - header({ title => $title, link => $linkrel }) or return; + header({ title => $title, link => $linkrel }, '', { meta_desc => $meta_desc }) or return; if ($form->{remark} && $user->{is_subscriber} From svnnotify ¡÷ sourceforge.jp Mon Mar 16 21:14:11 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Mon, 16 Mar 2009 21:14:11 +0900 Subject: [Slashdotjp-dev 1544] [1075] Redirect Antenna URL on IndexHandler Message-ID: <1237205651.565199.25693.nullmailer@users.sourceforge.jp> Revision: 1075 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1075 Author: tach Date: 2009-03-16 21:14:11 +0900 (Mon, 16 Mar 2009) Log Message: ----------- Redirect Antenna URL on IndexHandler Modified Paths: -------------- slashjp/trunk/Slash/Apache/Apache.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/Apache/Apache.pm =================================================================== --- slashjp/trunk/Slash/Apache/Apache.pm 2009-03-16 11:36:56 UTC (rev 1074) +++ slashjp/trunk/Slash/Apache/Apache.pm 2009-03-16 12:14:11 UTC (rev 1075) @@ -372,6 +372,11 @@ # $uri =~ s/^\Q$path//; #} + # Redirect antenna URL + if ($r->the_request =~ m! /(\S*)\?\d+ !) { + redirect("$constants->{absolutedir}/$1", 301); + } + # redirect to new journal rss URL for slashdot.jp (2008-09-16, tach) # Before: /journal.pl?op=display&uid=3&content_type=rss # After: /~tach/journal/rss Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-16 11:36:56 UTC (rev 1074) +++ slashjp/trunk/debian/changelog 2009-03-16 12:14:11 UTC (rev 1075) @@ -3,8 +3,9 @@ * Add HTML "" into sevaral pages - article.pl: already inserted, change content to introtext - index.pl: add data "meta_desc" and title of first 5 articles + * Redirect Antenna URL on IndexHandler - -- Taku YASUI Mon, 16 Mar 2009 11:36:00 +0000 + -- Taku YASUI Mon, 16 Mar 2009 12:13:50 +0000 slash (2.5.0.233-7) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Tue Mar 17 16:36:10 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 17 Mar 2009 16:36:10 +0900 Subject: [Slashdotjp-dev 1545] [1076] Add HTML "" into journal.pl: add first 250 chars of article on article page Message-ID: <1237275370.789870.12920.nullmailer@users.sourceforge.jp> Revision: 1076 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1076 Author: tach Date: 2009-03-17 16:36:10 +0900 (Tue, 17 Mar 2009) Log Message: ----------- Add HTML "" into journal.pl: add first 250 chars of article on article page Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Journal/journal.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-16 12:14:11 UTC (rev 1075) +++ slashjp/trunk/debian/changelog 2009-03-17 07:36:10 UTC (rev 1076) @@ -3,9 +3,10 @@ * Add HTML "" into sevaral pages - article.pl: already inserted, change content to introtext - index.pl: add data "meta_desc" and title of first 5 articles + - journal.pl: add first 250 chars of article on article page * Redirect Antenna URL on IndexHandler - -- Taku YASUI Mon, 16 Mar 2009 12:13:50 +0000 + -- Taku YASUI Tue, 17 Mar 2009 07:34:24 +0000 slash (2.5.0.233-7) unstable; urgency=low Modified: slashjp/trunk/plugins/Journal/journal.pl =================================================================== --- slashjp/trunk/plugins/Journal/journal.pl 2009-03-16 12:14:11 UTC (rev 1075) +++ slashjp/trunk/plugins/Journal/journal.pl 2009-03-17 07:36:10 UTC (rev 1076) @@ -519,6 +519,8 @@ if (@$articles == 1) { $head_data->{html_title} = $articles->[0]->[2]; + $head_data->{meta_desc} = shorten(strip_nohtml($articles->[0]->[1]), 250); + $head_data->{meta_desc} =~ s/[\r\n\s]+/ /g; } $head_data->{jcount} = scalar(@$articles); _printHead('userhead', $head_data, 1) or return; @@ -1002,6 +1004,8 @@ my $html_title = (defined($data->{html_title}) ? $data->{html_title}." - " : '') . $title; my $options = { last_modified => $data->{last_modified} }; + $options->{meta_desc} = $data->{meta_desc} if (defined $data->{meta_desc}); + my $links = { title => $html_title, 'link' => { From svnnotify ¡÷ sourceforge.jp Tue Mar 17 16:45:01 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 17 Mar 2009 16:45:01 +0900 Subject: [Slashdotjp-dev 1546] [1077] Add HTML "" into journal.pl: add first 250 chars of article tltles on index page Message-ID: <1237275901.388928.23742.nullmailer@users.sourceforge.jp> Revision: 1077 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1077 Author: tach Date: 2009-03-17 16:45:01 +0900 (Tue, 17 Mar 2009) Log Message: ----------- Add HTML "" into journal.pl: add first 250 chars of article tltles on index page Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Journal/journal.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-17 07:36:10 UTC (rev 1076) +++ slashjp/trunk/debian/changelog 2009-03-17 07:45:01 UTC (rev 1077) @@ -4,9 +4,10 @@ - article.pl: already inserted, change content to introtext - index.pl: add data "meta_desc" and title of first 5 articles - journal.pl: add first 250 chars of article on article page + - journal.pl: add first 250 chars of article titles on index page * Redirect Antenna URL on IndexHandler - -- Taku YASUI Tue, 17 Mar 2009 07:34:24 +0000 + -- Taku YASUI Tue, 17 Mar 2009 07:44:20 +0000 slash (2.5.0.233-7) unstable; urgency=low Modified: slashjp/trunk/plugins/Journal/journal.pl =================================================================== --- slashjp/trunk/plugins/Journal/journal.pl 2009-03-17 07:36:10 UTC (rev 1076) +++ slashjp/trunk/plugins/Journal/journal.pl 2009-03-17 07:45:01 UTC (rev 1077) @@ -518,10 +518,15 @@ } if (@$articles == 1) { - $head_data->{html_title} = $articles->[0]->[2]; - $head_data->{meta_desc} = shorten(strip_nohtml($articles->[0]->[1]), 250); - $head_data->{meta_desc} =~ s/[\r\n\s]+/ /g; + $head_data->{html_title} = $articles->[0]->[2]; + $head_data->{meta_desc} = $articles->[0]->[1]; + } else { + foreach my $a (@$articles) { + $head_data->{meta_desc} .= $a->[2] . "\x{3002}" if ($a->[2]); + } } + $head_data->{meta_desc} = shorten(strip_nohtml($head_data->{meta_desc}), 250); + $head_data->{meta_desc} =~ s/[\r\n\s]+/ /g; $head_data->{jcount} = scalar(@$articles); _printHead('userhead', $head_data, 1) or return; From svnnotify ¡÷ sourceforge.jp Tue Mar 17 17:18:18 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 17 Mar 2009 17:18:18 +0900 Subject: [Slashdotjp-dev 1547] [1078] Add HTML "" into pollBooth.pl Message-ID: <1237277898.151685.531.nullmailer@users.sourceforge.jp> Revision: 1078 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1078 Author: tach Date: 2009-03-17 17:18:18 +0900 (Tue, 17 Mar 2009) Log Message: ----------- Add HTML "" into pollBooth.pl - add first 250 chars of question and answers on indevidual page - add first 250 chars of questions on index page Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/PollBooth/pollBooth.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-17 07:45:01 UTC (rev 1077) +++ slashjp/trunk/debian/changelog 2009-03-17 08:18:18 UTC (rev 1078) @@ -5,9 +5,12 @@ - index.pl: add data "meta_desc" and title of first 5 articles - journal.pl: add first 250 chars of article on article page - journal.pl: add first 250 chars of article titles on index page + - pollBooth.pl: add first 250 chars of question and answers on indevidual + page + - pollBooth.pl: add first 250 chars of questions on index page * Redirect Antenna URL on IndexHandler - -- Taku YASUI Tue, 17 Mar 2009 07:44:20 +0000 + -- Taku YASUI Tue, 17 Mar 2009 08:15:45 +0000 slash (2.5.0.233-7) unstable; urgency=low Modified: slashjp/trunk/plugins/PollBooth/pollBooth.pl =================================================================== --- slashjp/trunk/plugins/PollBooth/pollBooth.pl 2009-03-17 07:45:01 UTC (rev 1077) +++ slashjp/trunk/plugins/PollBooth/pollBooth.pl 2009-03-17 08:18:18 UTC (rev 1078) @@ -59,14 +59,28 @@ } # create title + my $polldb = getObject('Slash::PollBooth', { db_type => 'reader' }); my $title = getData('title'); + my $meta_desc = ''; if ($form->{qid}) { - my $polldb = getObject('Slash::PollBooth', { db_type => 'reader' }); - $title .= ': ' . $polldb->getPollQuestion($form->{qid})->{question}; + my $pollq = $polldb->getPollQuestion($form->{qid}); + $title .= ': ' . $pollq->{question}; + $meta_desc = $pollq->{question} . " "; + my $pollans = $polldb->getPollAnswers($form->{qid}, [ 'answer' ]); + foreach my $a (@$pollans) { + $meta_desc .= $a->[0] . "\x{3002}" if ($a->[0]); + } + } else { + my $questions = $polldb->getPollQuestionList(10); + $meta_desc = ''; + foreach my $q (@$questions) { + $meta_desc .= $q->[1] . " " if ($q->[1]); + } } + $meta_desc = shorten(strip_nohtml($meta_desc), 250); $title .= " - $constants->{sitename}"; - header($title, $form->{section}, { tab_selected => 'poll'}) or return; + header($title, $form->{section}, { tab_selected => 'poll', meta_desc => $meta_desc }) or return; $ops{$op}->($form, $slashdb, $constants); From svnnotify ¡÷ sourceforge.jp Wed Mar 18 18:41:17 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 18 Mar 2009 18:41:17 +0900 Subject: [Slashdotjp-dev 1548] [1079] Fix getStoryByTime() condition (never return "neverdisplay" stories ) Message-ID: <1237369277.179487.22091.nullmailer@users.sourceforge.jp> Revision: 1079 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1079 Author: tach Date: 2009-03-18 18:41:17 +0900 (Wed, 18 Mar 2009) Log Message: ----------- Fix getStoryByTime() condition (never return "neverdisplay" stories) Modified Paths: -------------- slashjp/trunk/Slash/DB/MySQL/MySQL.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/MySQL/MySQL.pm =================================================================== --- slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-03-17 08:18:18 UTC (rev 1078) +++ slashjp/trunk/Slash/DB/MySQL/MySQL.pm 2009-03-18 09:41:17 UTC (rev 1079) @@ -5994,6 +5994,7 @@ AND time $sign '$time' AND time <= $now AND in_trash = 'no' + AND stoid NOT IN (SELECT stoid FROM story_param WHERE name='neverdisplay' AND value=1) $where", "$groupby ORDER BY time $order LIMIT $limit" ); Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-17 08:18:18 UTC (rev 1078) +++ slashjp/trunk/debian/changelog 2009-03-18 09:41:17 UTC (rev 1079) @@ -9,8 +9,9 @@ page - pollBooth.pl: add first 250 chars of questions on index page * Redirect Antenna URL on IndexHandler + * Fix getStoryByTime() condition (never return "neverdisplay" stories) - -- Taku YASUI Tue, 17 Mar 2009 08:15:45 +0000 + -- Taku YASUI Wed, 18 Mar 2009 09:39:55 +0000 slash (2.5.0.233-7) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Tue Mar 24 18:04:15 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 24 Mar 2009 18:04:15 +0900 Subject: [Slashdotjp-dev 1549] [1080] Enable to use absolute path for content:encoded link in RSS.pm Message-ID: <1237885455.877073.21170.nullmailer@users.sourceforge.jp> Revision: 1080 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1080 Author: tach Date: 2009-03-24 18:04:15 +0900 (Tue, 24 Mar 2009) Log Message: ----------- Enable to use absolute path for content:encoded link in RSS.pm Modified Paths: -------------- slashjp/trunk/Slash/XML/RSS/RSS.pm slashjp/trunk/debian/changelog -------------- next part -------------- Modified: slashjp/trunk/Slash/XML/RSS/RSS.pm =================================================================== --- slashjp/trunk/Slash/XML/RSS/RSS.pm 2009-03-18 09:41:17 UTC (rev 1079) +++ slashjp/trunk/Slash/XML/RSS/RSS.pm 2009-03-24 09:04:15 UTC (rev 1080) @@ -167,6 +167,9 @@ $self->{rdfitem_content_encoded} = defined $param->{rdfitem_content_encoded} ? $param->{rdfitem_content_encoded} : $constants->{rdfitem_content_encoded}; + $self->{rdfitemdesc_link_absolute} = defined $param->{rdfitemdesc_link_absolute} + ? $param->{rdfitemdesc_link_absolute} + : $constants->{rdfitemdesc_link_absolute}; my $rss = XML::RSS->new( version => $version, @@ -561,7 +564,7 @@ # slashized links or slash tags ... but if # we do have a problem, we can move this to # rss_story() -- pudge - $desc = parseSlashizedLinks($desc); + $desc = parseSlashizedLinks($desc, { absolute => $self->{rdfitemdesc_link_absolute} }); $desc = processSlashTags($desc); # here we could reprocess content as XHTML if we Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-18 09:41:17 UTC (rev 1079) +++ slashjp/trunk/debian/changelog 2009-03-24 09:04:15 UTC (rev 1080) @@ -10,8 +10,9 @@ - pollBooth.pl: add first 250 chars of questions on index page * Redirect Antenna URL on IndexHandler * Fix getStoryByTime() condition (never return "neverdisplay" stories) + * Enable to use absolute path for content:encoded link in RSS.pm - -- Taku YASUI Wed, 18 Mar 2009 09:39:55 +0000 + -- Taku YASUI Tue, 24 Mar 2009 09:02:10 +0000 slash (2.5.0.233-7) unstable; urgency=low From svnnotify ¡÷ sourceforge.jp Tue Mar 24 20:08:54 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 24 Mar 2009 20:08:54 +0900 Subject: [Slashdotjp-dev 1550] [1081] Hide topics that is not searchable Message-ID: <1237892934.207789.26772.nullmailer@users.sourceforge.jp> Revision: 1081 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1081 Author: tach Date: 2009-03-24 20:08:54 +0900 (Tue, 24 Mar 2009) Log Message: ----------- Hide topics that is not searchable Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/themes/slashcode/htdocs/topics.pl -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-24 09:04:15 UTC (rev 1080) +++ slashjp/trunk/debian/changelog 2009-03-24 11:08:54 UTC (rev 1081) @@ -11,8 +11,9 @@ * Redirect Antenna URL on IndexHandler * Fix getStoryByTime() condition (never return "neverdisplay" stories) * Enable to use absolute path for content:encoded link in RSS.pm + * Hide topics that is not searchable - -- Taku YASUI Tue, 24 Mar 2009 09:02:10 +0000 + -- Taku YASUI Tue, 24 Mar 2009 11:07:59 +0000 slash (2.5.0.233-7) unstable; urgency=low Modified: slashjp/trunk/themes/slashcode/htdocs/topics.pl =================================================================== --- slashjp/trunk/themes/slashcode/htdocs/topics.pl 2009-03-24 09:04:15 UTC (rev 1080) +++ slashjp/trunk/themes/slashcode/htdocs/topics.pl 2009-03-24 11:08:54 UTC (rev 1081) @@ -72,6 +72,10 @@ delete($topics->{$id}) if ($constants->{topiclist_dont_show_nexuses}); } + foreach (keys %$topics) { + delete($topics->{$_}) if ($topics->{$_}{searchable} eq 'no'); + } + slashDisplay('listTopics', { title => getData('current_topics'), width => '90%', From svnnotify ¡÷ sourceforge.jp Wed Mar 25 14:16:16 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Wed, 25 Mar 2009 14:16:16 +0900 Subject: [Slashdotjp-dev 1551] [1082] add style for google search form in error and ads-article-premium Message-ID: <1237958176.215072.22297.nullmailer@users.sourceforge.jp> Revision: 1082 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1082 Author: tach Date: 2009-03-25 14:16:16 +0900 (Wed, 25 Mar 2009) Log Message: ----------- add style for google search form in error and ads-article-premium Modified Paths: -------------- images/trunk/css/slashdotjp.css -------------- next part -------------- Modified: images/trunk/css/slashdotjp.css =================================================================== --- images/trunk/css/slashdotjp.css 2009-03-24 11:08:54 UTC (rev 1081) +++ images/trunk/css/slashdotjp.css 2009-03-25 05:16:16 UTC (rev 1082) @@ -636,6 +636,12 @@ text-align: center; } +/* google search form in error */ +div.error form { + background: #FDD; + padding-left: 0; +} + /* d1 fix */ #commentlisting.d1 { padding: 0; @@ -781,6 +787,12 @@ text-align: center; } +#ads-article-premium { + width: 360px; + height: 250px; + overflow: hidden; +} + div.article div.bigbanner, div.adsense_468x60 { overflow: hidden; From svnnotify ¡÷ sourceforge.jp Thu Mar 26 17:35:40 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 26 Mar 2009 17:35:40 +0900 Subject: [Slashdotjp-dev 1552] [1083] * Add authors journal mode Message-ID: <1238056540.577218.17342.nullmailer@users.sourceforge.jp> Revision: 1083 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1083 Author: tach Date: 2009-03-26 17:35:40 +0900 (Thu, 26 Mar 2009) Log Message: ----------- * Add authors journal mode - /journal.pl?op=authorview * Smart URL for authors - /authors/ => /authors.pl - /authors/journal/ => /journal.pl?op=authorview Modified Paths: -------------- slashjp/trunk/Slash/Apache/User/User.pm slashjp/trunk/debian/changelog slashjp/trunk/plugins/Journal/journal.pl slashjp/trunk/plugins/Journal/templates/data;journal;default -------------- next part -------------- Modified: slashjp/trunk/Slash/Apache/User/User.pm =================================================================== --- slashjp/trunk/Slash/Apache/User/User.pm 2009-03-25 05:16:16 UTC (rev 1082) +++ slashjp/trunk/Slash/Apache/User/User.pm 2009-03-26 08:35:40 UTC (rev 1083) @@ -637,6 +637,29 @@ return OK; } + # authors for slashdot.jp + if ($uri =~ m!^/authors(/[^?]*|/?)(\?.*)?$!) { + my($word, $query) = ($1, $2); + if ($word =~ s!/{2,}!/!g || $word =~ s!([^/])\z!$1/! || $word =~ s!^\z!/!) { + redirect($constants->{real_rootdir} . "/authors$word$query", 301); + } + $query =~ s/^\?//; + my $file = undef; + if ($word eq '/') { + $file = '/authors.pl'; + } elsif ($word eq '/journal/') { + $file = '/journal.pl'; + my @args = ($query); + push(@args, 'op=authorview'); + $query = join('&', @args); + } else { + return NOT_FOUND; + } + $r->uri($file); + $r->args($query); + $r->filename($constants->{basedir} . $file); + } + # for self-references (/~/ and /my/) if (($saveuri =~ m[^/(?:%7[eE]|~)] && $uri =~ m[^/~ (?: /(.*) | /? ) $]x) # /my/ or /my can match, but not /mything Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-25 05:16:16 UTC (rev 1082) +++ slashjp/trunk/debian/changelog 2009-03-26 08:35:40 UTC (rev 1083) @@ -12,8 +12,13 @@ * Fix getStoryByTime() condition (never return "neverdisplay" stories) * Enable to use absolute path for content:encoded link in RSS.pm * Hide topics that is not searchable + * Add authors journal mode + - /journal.pl?op=authorview + * Smart URL for authors + - /authors/ => /authors.pl + - /authors/journal/ => /journal.pl?op=authorview - -- Taku YASUI Tue, 24 Mar 2009 11:07:59 +0000 + -- Taku YASUI Thu, 26 Mar 2009 08:33:54 +0000 slash (2.5.0.233-7) unstable; urgency=low Modified: slashjp/trunk/plugins/Journal/journal.pl =================================================================== --- slashjp/trunk/plugins/Journal/journal.pl 2009-03-25 05:16:16 UTC (rev 1082) +++ slashjp/trunk/plugins/Journal/journal.pl 2009-03-26 08:35:40 UTC (rev 1083) @@ -74,6 +74,7 @@ searchusers => [ 1, \&searchUsers ], friends => [ 1, \&displayFriends ], friendview => [ 1, \&displayArticleFriends ], + authorview => [ 1, \&displayArticleAuthors ], default => [ 1, \&displayFriends ], ); @@ -462,6 +463,80 @@ print getData('journalfoot'); } +sub displayArticleAuthors { + my($journal, $constants, $user, $form, $journal_reader) = @_; + my($date, $forward, $back, $nickname, $uid); + my @collection; + my $header_options = {}; + my $links = { + title => 'authors journal', + }; + + _printHead('authorhead', { no_usermenu => 1 }) or return; + + # clean it up + my $start = fixint($form->{start}) || 0; + my $uids = [ keys(%{$journal_reader->getAuthors()}) ]; + my $articles = $journal_reader->getsByUids($uids, $start, + $constants->{journal_default_display} + 1 + ); + + unless ($articles && @$articles) { + print getData('noviewfriends'); + print getData('journalfoot'); + return; + } + + # check for extra articles ... we request one more than we need + # and if we get the extra one, we know we have extra ones, and + # we pop it off + if (@$articles == $constants->{journal_default_display} + 1) { + pop @$articles; + $forward = $start + $constants->{journal_default_display}; + } else { + $forward = 0; + } + + # if there are less than journal_default_display remaning, + # just set it to 0 + if ($start > 0) { + $back = $start - $constants->{journal_default_display}; + $back = $back > 0 ? $back : 0; + } else { + $back = -1; + } + + my $topics = $journal_reader->getTopics; + for my $article (@$articles) { + my $commentcount = $article->[6] + ? $journal_reader->getDiscussion($article->[6], 'commentcount') + : 0; + + # should get comment count, too -- pudge + push @collection, { + article => balanceTags(strip_mode($article->[1], $article->[4]), { deep_nesting => 1 }), + date => $article->[0], + description => strip_notags($article->[2]), + topic => $topics->{$article->[5]}, + discussion => $article->[6], + id => $article->[3], + commentcount => $commentcount, + uid => $article->[7], + nickname => $article->[8], + }; + } + + slashDisplay('authorsview', { + articles => \@collection, + uid => $uid, + nickname => $nickname, + back => $back, + forward => $forward, + }); + + print getData('journalfoot'); +} + sub displayArticle { my($journal, $constants, $user, $form, $journal_reader) = @_; my($date, $forward, $back, @sorted_articles, $nickname, $uid, $karma, $discussion); Modified: slashjp/trunk/plugins/Journal/templates/data;journal;default =================================================================== --- slashjp/trunk/plugins/Journal/templates/data;journal;default 2009-03-25 05:16:16 UTC (rev 1082) +++ slashjp/trunk/plugins/Journal/templates/data;journal;default 2009-03-26 08:35:40 UTC (rev 1083) @@ -94,6 +94,10 @@ [% CASE 'rss_fv_desc' %] [% nickname %]'s Friends' [% constants.sitename %] Journals +[% CASE 'authorhead' %] + [% returnme.data_constant = 1 %] + [% constants.sitename %] Authors' Journal + [% END %] __seclev__ From svnnotify ¡÷ sourceforge.jp Thu Mar 26 18:09:00 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Thu, 26 Mar 2009 18:09:00 +0900 Subject: [Slashdotjp-dev 1553] [1084] fix opname as the same of template name Message-ID: <1238058540.330270.30484.nullmailer@users.sourceforge.jp> Revision: 1084 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1084 Author: tach Date: 2009-03-26 18:09:00 +0900 (Thu, 26 Mar 2009) Log Message: ----------- fix opname as the same of template name Modified Paths: -------------- slashjp/trunk/Slash/Apache/User/User.pm slashjp/trunk/debian/changelog slashjp/trunk/plugins/Journal/journal.pl -------------- next part -------------- Modified: slashjp/trunk/Slash/Apache/User/User.pm =================================================================== --- slashjp/trunk/Slash/Apache/User/User.pm 2009-03-26 08:35:40 UTC (rev 1083) +++ slashjp/trunk/Slash/Apache/User/User.pm 2009-03-26 09:09:00 UTC (rev 1084) @@ -650,7 +650,7 @@ } elsif ($word eq '/journal/') { $file = '/journal.pl'; my @args = ($query); - push(@args, 'op=authorview'); + push(@args, 'op=authorsview'); $query = join('&', @args); } else { return NOT_FOUND; Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-26 08:35:40 UTC (rev 1083) +++ slashjp/trunk/debian/changelog 2009-03-26 09:09:00 UTC (rev 1084) @@ -13,12 +13,12 @@ * Enable to use absolute path for content:encoded link in RSS.pm * Hide topics that is not searchable * Add authors journal mode - - /journal.pl?op=authorview + - /journal.pl?op=authorsview * Smart URL for authors - /authors/ => /authors.pl - - /authors/journal/ => /journal.pl?op=authorview + - /authors/journal/ => /journal.pl?op=authorsview - -- Taku YASUI Thu, 26 Mar 2009 08:33:54 +0000 + -- Taku YASUI Thu, 26 Mar 2009 09:08:27 +0000 slash (2.5.0.233-7) unstable; urgency=low Modified: slashjp/trunk/plugins/Journal/journal.pl =================================================================== --- slashjp/trunk/plugins/Journal/journal.pl 2009-03-26 08:35:40 UTC (rev 1083) +++ slashjp/trunk/plugins/Journal/journal.pl 2009-03-26 09:09:00 UTC (rev 1084) @@ -74,7 +74,7 @@ searchusers => [ 1, \&searchUsers ], friends => [ 1, \&displayFriends ], friendview => [ 1, \&displayArticleFriends ], - authorview => [ 1, \&displayArticleAuthors ], + authorsview => [ 1, \&displayArticleAuthors ], default => [ 1, \&displayFriends ], ); From svnnotify ¡÷ sourceforge.jp Fri Mar 27 12:12:42 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 27 Mar 2009 12:12:42 +0900 Subject: [Slashdotjp-dev 1554] [1085] fix vim color Message-ID: <1238123562.191258.28727.nullmailer@users.sourceforge.jp> Revision: 1085 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1085 Author: tach Date: 2009-03-27 12:12:42 +0900 (Fri, 27 Mar 2009) Log Message: ----------- fix vim color Modified Paths: -------------- slashjp/trunk/Slash/Apache/User/User.pm -------------- next part -------------- Modified: slashjp/trunk/Slash/Apache/User/User.pm =================================================================== --- slashjp/trunk/Slash/Apache/User/User.pm 2009-03-26 09:09:00 UTC (rev 1084) +++ slashjp/trunk/Slash/Apache/User/User.pm 2009-03-27 03:12:42 UTC (rev 1085) @@ -590,7 +590,7 @@ return OK; } - if ($uri =~ m[^/help (?: /([^?]*) | /? ) $]x) { + if ($uri =~ m!^/help (?: /([^?]*) | /? ) $!x) { $r->args("op=displayhelp"); $r->uri('/help.pl'); $r->filename($constants->{basedir} . '/help.pl'); @@ -661,9 +661,9 @@ } # for self-references (/~/ and /my/) - if (($saveuri =~ m[^/(?:%7[eE]|~)] && $uri =~ m[^/~ (?: /(.*) | /? ) $]x) + if (($saveuri =~ m!^/(?:%7[eE]|~)! && $uri =~ m!^/~ (?: /(.*) | /? ) $!x) # /my/ or /my can match, but not /mything - || $uri =~ m[^/my (?: /(.*) | /? ) $]x + || $uri =~ m!^/my (?: /(.*) | /? ) $!x ) { my($string, $query) = ($1, ''); if ($string =~ s/\?(.+)$//) { @@ -804,7 +804,7 @@ return OK; - } elsif ($uri =~ m[^/bookmarks (?: /(.*) | /? ) $]x) { + } elsif ($uri =~ m!^/bookmarks (?: /(.*) | /? ) $!x) { $r->args('op=showbookmarks'); $r->uri('/bookmark.pl'); $r->filename($constants->{basedir} . '/bookmark.pl'); @@ -815,7 +815,7 @@ # returning it, we have to re-encode it with fixparam(). that # will change if somehow Apache/mod_perl no longer decodes before # returning the data. -- pudge - if (($saveuri =~ m[^/(?:%7[eE]|~)(.+)]) || ($saveuri =~ m[^/(?:%5[eE]|\^)(.+)])) { + if (($saveuri =~ m!^/(?:%7[eE]|~)(.+)!) || ($saveuri =~ m!^/(?:%5[eE]|\^)(.+)!)) { my($string, $query) = ($1, ''); if ($string =~ s/\?(.+)$//) { $query = $1; From svnnotify ¡÷ sourceforge.jp Fri Mar 27 12:20:27 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 27 Mar 2009 12:20:27 +0900 Subject: [Slashdotjp-dev 1555] [1086] add original args to "/my/amigos/" Message-ID: <1238124027.853458.6558.nullmailer@users.sourceforge.jp> Revision: 1086 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1086 Author: tach Date: 2009-03-27 12:20:27 +0900 (Fri, 27 Mar 2009) Log Message: ----------- add original args to "/my/amigos/" Modified Paths: -------------- slashjp/trunk/Slash/Apache/User/User.pm -------------- next part -------------- Modified: slashjp/trunk/Slash/Apache/User/User.pm =================================================================== --- slashjp/trunk/Slash/Apache/User/User.pm 2009-03-27 03:12:42 UTC (rev 1085) +++ slashjp/trunk/Slash/Apache/User/User.pm 2009-03-27 03:20:27 UTC (rev 1086) @@ -761,7 +761,9 @@ $r->filename($constants->{basedir} . '/users.pl'); } elsif ($op eq 'amigos') { - $r->args("op=friendview"); + my $args = 'op=friendview'; + $args .= '&' . $query if ($query); + $r->args($args); $r->uri('/journal.pl'); $r->filename($constants->{basedir} . '/journal.pl'); From svnnotify ¡÷ sourceforge.jp Fri Mar 27 15:49:21 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 27 Mar 2009 15:49:21 +0900 Subject: [Slashdotjp-dev 1556] [1087] add importing function name Message-ID: <1238136561.402377.23351.nullmailer@users.sourceforge.jp> Revision: 1087 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1087 Author: tach Date: 2009-03-27 15:49:21 +0900 (Fri, 27 Mar 2009) Log Message: ----------- add importing function name Modified Paths: -------------- slashjp/trunk/Slash/DB/Utility/Utility.pm -------------- next part -------------- Modified: slashjp/trunk/Slash/DB/Utility/Utility.pm =================================================================== --- slashjp/trunk/Slash/DB/Utility/Utility.pm 2009-03-27 03:20:27 UTC (rev 1086) +++ slashjp/trunk/Slash/DB/Utility/Utility.pm 2009-03-27 06:49:21 UTC (rev 1087) @@ -9,7 +9,7 @@ use Slash::Utility; use DBIx::Password; use Time::HiRes; -use Encode; +use Encode qw(decode_utf8 is_utf8); our $VERSION = $Slash::Constants::VERSION; @@ -1090,7 +1090,7 @@ my($self, $sql) = @_; $self->_refCheck($sql); $self->sqlConnect() or return undef; - Encode::is_utf8($sql) or $sql = decode_utf8($sql); + is_utf8($sql) or $sql = decode_utf8($sql); my $rows = $self->{_dbh}->do($sql); unless ($rows) { unless ($sql =~ /^INSERT\s+IGNORE\b/i) { From svnnotify ¡÷ sourceforge.jp Fri Mar 27 15:59:02 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 27 Mar 2009 15:59:02 +0900 Subject: [Slashdotjp-dev 1557] [1088] add importing function name Message-ID: <1238137142.670764.5289.nullmailer@users.sourceforge.jp> Revision: 1088 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1088 Author: tach Date: 2009-03-27 15:59:02 +0900 (Fri, 27 Mar 2009) Log Message: ----------- add importing function name Modified Paths: -------------- slashjp/trunk/Slash/Utility/Data/Data.pm -------------- next part -------------- Modified: slashjp/trunk/Slash/Utility/Data/Data.pm =================================================================== --- slashjp/trunk/Slash/Utility/Data/Data.pm 2009-03-27 06:49:21 UTC (rev 1087) +++ slashjp/trunk/Slash/Utility/Data/Data.pm 2009-03-27 06:59:02 UTC (rev 1088) @@ -32,6 +32,7 @@ use Date::Language; use Date::Parse qw(str2time); use Digest::MD5 qw(md5_hex md5_base64); +use Encode qw(encode_utf8); use Email::Valid; use HTML::Entities qw(:DEFAULT %char2entity %entity2char); use HTML::FormatText; @@ -46,7 +47,6 @@ use Slash::Apache::User::PasswordSalt; use URI; use XML::Parser; -use Encode; use base 'Exporter'; From svnnotify ¡÷ sourceforge.jp Fri Mar 27 18:45:08 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Fri, 27 Mar 2009 18:45:08 +0900 Subject: [Slashdotjp-dev 1558] [1089] add importing function name Message-ID: <1238147108.602593.6285.nullmailer@users.sourceforge.jp> Revision: 1089 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1089 Author: tach Date: 2009-03-27 18:45:08 +0900 (Fri, 27 Mar 2009) Log Message: ----------- add importing function name Modified Paths: -------------- slashjp/trunk/Slash/Utility/Data/Data.pm -------------- next part -------------- Modified: slashjp/trunk/Slash/Utility/Data/Data.pm =================================================================== --- slashjp/trunk/Slash/Utility/Data/Data.pm 2009-03-27 06:59:02 UTC (rev 1088) +++ slashjp/trunk/Slash/Utility/Data/Data.pm 2009-03-27 09:45:08 UTC (rev 1089) @@ -32,7 +32,7 @@ use Date::Language; use Date::Parse qw(str2time); use Digest::MD5 qw(md5_hex md5_base64); -use Encode qw(encode_utf8); +use Encode qw(encode_utf8 decode_utf8 is_utf8); use Email::Valid; use HTML::Entities qw(:DEFAULT %char2entity %entity2char); use HTML::FormatText; @@ -2259,7 +2259,7 @@ sub fixparam { my($url) = @_; no utf8; - Encode::is_utf8($url) and $url = Encode::encode_utf8($url); + $url = encode_utf8($url) if (is_utf8($url)); $url =~ s/([^$URI::unreserved ])/$URI::Escape::escapes{$1}/og; $url =~ s/ /%20/g; return $url; @@ -2303,7 +2303,7 @@ sub fixurl { my($url) = @_; no utf8; - Encode::is_utf8($url) and $url = Encode::encode_utf8($url); + $url = encode_utf8($url) if (is_utf8($url)); $url =~ s/([^$allowed])/$URI::Escape::escapes{$1}/og; $url =~ s/%(?![a-fA-F0-9]{2})/%25/g; return $url; @@ -2505,12 +2505,12 @@ sub chopEntity { my($text, $length, $end) = @_; my $constants = getCurrentStatic(); - Encode::is_utf8($text) or $text = Encode::decode_utf8($text); + $text = decode_utf8($text) unless (is_utf8($text)); $end and $text = join('', reverse(split(//, $text))); if ($constants->{tweak_japanese}) { require Jcode; - $text = [Jcode->new(Encode::encode_utf8($text), 'utf8')->jfold($length, '')]->[0]; - $text = Encode::decode('utf-8', $text); + $text = [Jcode->new(encode_utf8($text), 'utf8')->jfold($length, '')]->[0]; + $text = decode_utf8($text); } else { $text = substr($text, 0, $length); } @@ -2558,7 +2558,7 @@ sub html2text { my($html, $col) = @_; - my($text, $tree, $form, $refs, $was_utf8); + my($text, $tree, $form, $refs); my $user = getCurrentUser(); my $gSkin = getCurrentSkin(); @@ -2569,7 +2569,7 @@ $form = new HTML::FormatText (leftmargin => 0, rightmargin => $col-2); $refs = new HTML::FormatText::AddRefs; - $was_utf8 = Encode::is_utf8( $html ); + my $was_utf8 = is_utf8($html); $tree->parse($html); $tree->eof; $refs->parse_refs($tree); @@ -2577,7 +2577,7 @@ 1 while chomp($text); # restore UTF-8 Flag lost by HTML::TreeBuilder - $text = Encode::decode_utf8( $text ); + $text = decode_utf8($text) if ($was_utf8); return $text, $refs->get_refs($gSkin->{absolutedir}); } From svnnotify ¡÷ sourceforge.jp Tue Mar 31 19:29:46 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 31 Mar 2009 19:29:46 +0900 Subject: [Slashdotjp-dev 1559] [1090] Set only otherLinks to relatedtext when " relatedtext_only_otherlinks" is set Message-ID: <1238495386.838867.31163.nullmailer@users.sourceforge.jp> Revision: 1090 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1090 Author: tach Date: 2009-03-31 19:29:46 +0900 (Tue, 31 Mar 2009) Log Message: ----------- Set only otherLinks to relatedtext when "relatedtext_only_otherlinks" is set Modified Paths: -------------- slashjp/trunk/debian/changelog slashjp/trunk/plugins/Admin/Admin.pm -------------- next part -------------- Modified: slashjp/trunk/debian/changelog =================================================================== --- slashjp/trunk/debian/changelog 2009-03-27 09:45:08 UTC (rev 1089) +++ slashjp/trunk/debian/changelog 2009-03-31 10:29:46 UTC (rev 1090) @@ -17,8 +17,9 @@ * Smart URL for authors - /authors/ => /authors.pl - /authors/journal/ => /journal.pl?op=authorsview + * Set only otherLinks to relatedtext when "relatedtext_only_otherlinks" is set - -- Taku YASUI Thu, 26 Mar 2009 09:08:27 +0000 + -- Taku YASUI Tue, 31 Mar 2009 10:28:57 +0000 slash (2.5.0.233-7) unstable; urgency=low Modified: slashjp/trunk/plugins/Admin/Admin.pm =================================================================== --- slashjp/trunk/plugins/Admin/Admin.pm 2009-03-27 09:45:08 UTC (rev 1089) +++ slashjp/trunk/plugins/Admin/Admin.pm 2009-03-31 10:29:46 UTC (rev 1090) @@ -287,7 +287,9 @@ ################################################################## sub relatedLinks { my($self, $story_content, $tids, $nick, $uid) = @_; - my $relatedtext = $self->getRelated($story_content, $tids); + my $relatedtext = ''; + $relatedtext .= $self->getRelated($story_content, $tids) + if ($constants->{relatedtext_only_otherlinks}); $relatedtext .= $self->otherLinks($nick, $tids, $uid) if $nick; # If getRelated and otherLinks seem to be putting
  • From svnnotify ¡÷ sourceforge.jp Tue Mar 31 19:32:41 2009 From: svnnotify ¡÷ sourceforge.jp (svnnotify ¡÷ sourceforge.jp) Date: Tue, 31 Mar 2009 19:32:41 +0900 Subject: [Slashdotjp-dev 1560] [1091] fix condition Message-ID: <1238495561.217864.2192.nullmailer@users.sourceforge.jp> Revision: 1091 http://svn.sourceforge.jp/view?root=slashdotjp&view=rev&rev=1091 Author: tach Date: 2009-03-31 19:32:41 +0900 (Tue, 31 Mar 2009) Log Message: ----------- fix condition Modified Paths: -------------- slashjp/trunk/plugins/Admin/Admin.pm -------------- next part -------------- Modified: slashjp/trunk/plugins/Admin/Admin.pm =================================================================== --- slashjp/trunk/plugins/Admin/Admin.pm 2009-03-31 10:29:46 UTC (rev 1090) +++ slashjp/trunk/plugins/Admin/Admin.pm 2009-03-31 10:32:41 UTC (rev 1091) @@ -289,7 +289,7 @@ my($self, $story_content, $tids, $nick, $uid) = @_; my $relatedtext = ''; $relatedtext .= $self->getRelated($story_content, $tids) - if ($constants->{relatedtext_only_otherlinks}); + unless (getCurrentStatic('relatedtext_only_otherlinks')); $relatedtext .= $self->otherLinks($nick, $tids, $uid) if $nick; # If getRelated and otherLinks seem to be putting