You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/10/21 21:14:23 UTC
svn commit: r327247 - in /incubator/roller/branches/roller_2.0:
src/org/roller/presentation/servlets/TrackbackServlet.java
web/WEB-INF/classes/weblog.vm
Author: snoopdave
Date: Fri Oct 21 12:14:19 2005
New Revision: 327247
URL: http://svn.apache.org/viewcvs?rev=327247&view=rev
Log:
Don't allow trackbacks on a blog if blog doesn't allow comments
Modified:
incubator/roller/branches/roller_2.0/src/org/roller/presentation/servlets/TrackbackServlet.java
incubator/roller/branches/roller_2.0/web/WEB-INF/classes/weblog.vm
Modified: incubator/roller/branches/roller_2.0/src/org/roller/presentation/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/src/org/roller/presentation/servlets/TrackbackServlet.java?rev=327247&r1=327246&r2=327247&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/src/org/roller/presentation/servlets/TrackbackServlet.java (original)
+++ incubator/roller/branches/roller_2.0/src/org/roller/presentation/servlets/TrackbackServlet.java Fri Oct 21 12:14:19 2005
@@ -122,8 +122,9 @@
} else {
RollerRequest rreq = RollerRequest.getRollerRequest(req);
WeblogEntryData entry = rreq.getWeblogEntry();
-
- if (entry!=null && entry.getCommentsStillAllowed()) {
+ boolean siteAllows =
+ entry.getWebsite().getAllowComments().booleanValue();
+ if (entry!=null && siteAllows && entry.getCommentsStillAllowed()) {
String modTitle = blogName + ": " + title;
if (modTitle.length() >= 250) {
modTitle = modTitle.substring(0, 257);
Modified: incubator/roller/branches/roller_2.0/web/WEB-INF/classes/weblog.vm
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller_2.0/web/WEB-INF/classes/weblog.vm?rev=327247&r1=327246&r2=327247&view=diff
==============================================================================
--- incubator/roller/branches/roller_2.0/web/WEB-INF/classes/weblog.vm (original)
+++ incubator/roller/branches/roller_2.0/web/WEB-INF/classes/weblog.vm Fri Oct 21 12:14:19 2005
@@ -171,7 +171,7 @@
#set( $day = $entry.pubTime )
#set( $entries = [ $entry ] )
#parse( $dayTemplateId )
- #if($trackbacksEnabled)
+ #if($trackbacksEnabled && $website.allowComments && $entry.commentsStillAllowed)
<div class="trackbackUrl">
$text.get( "macro.weblog.trackback" ) #showTrackbackURL($entry)
</div>