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 2006/05/12 20:23:15 UTC
svn commit: r405821 - in
/incubator/roller/trunk/src/org/apache/roller/presentation: servlets/
velocity/ weblog/actions/ weblog/tags/
Author: snoopdave
Date: Fri May 12 11:23:13 2006
New Revision: 405821
URL: http://svn.apache.org/viewcvs?rev=405821&view=rev
Log:
use correct form of getAbsoulteContextURL() every where -- fixes intermittent emoticons bug
Modified:
incubator/roller/trunk/src/org/apache/roller/presentation/servlets/TrackbackServlet.java
incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageHelper.java
incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryFormAction.java
incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryPageModel.java
incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryContentTag.java
incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntrySummaryTag.java
incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryTextTag.java
Modified: incubator/roller/trunk/src/org/apache/roller/presentation/servlets/TrackbackServlet.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/presentation/servlets/TrackbackServlet.java?rev=405821&r1=405820&r2=405821&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/servlets/TrackbackServlet.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/presentation/servlets/TrackbackServlet.java Fri May 12 11:23:13 2006
@@ -179,7 +179,7 @@
// ...ensure trackbacker actually links to us
RollerContext rctx= RollerContext.getRollerContext();
- String absurl = rctx.getAbsoluteContextUrl();
+ String absurl = rctx.getAbsoluteContextUrl(req);
LinkbackExtractor linkback = new LinkbackExtractor(
comment.getUrl(), absurl + entry.getPermaLink());
if (linkback.getExcerpt() == null) {
Modified: incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageHelper.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageHelper.java?rev=405821&r1=405820&r2=405821&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageHelper.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/presentation/velocity/PageHelper.java Fri May 12 11:23:13 2006
@@ -107,7 +107,7 @@
mPagePlugins = ppmgr.createAndInitPagePlugins(
mWebsite,
RollerContext.getRollerContext().getServletContext(),
- RollerContext.getRollerContext().getAbsoluteContextUrl(),
+ RollerContext.getRollerContext().getAbsoluteContextUrl(request),
mVelocityContext);
}
Modified: incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryFormAction.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryFormAction.java?rev=405821&r1=405820&r2=405821&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryFormAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryFormAction.java Fri May 12 11:23:13 2006
@@ -648,7 +648,7 @@
Map plugins = ppmgr.createAndInitPagePlugins(
entry.getWebsite(),
RollerContext.getRollerContext().getServletContext(),
- RollerContext.getRollerContext().getAbsoluteContextUrl(),
+ RollerContext.getRollerContext().getAbsoluteContextUrl(request),
new VelocityContext());
String content = "";
Modified: incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryPageModel.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryPageModel.java?rev=405821&r1=405820&r2=405821&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryPageModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/presentation/weblog/actions/WeblogEntryPageModel.java Fri May 12 11:23:13 2006
@@ -229,7 +229,7 @@
Map plugins = ppmgr.createAndInitPagePlugins(
getWebsite(),
RollerContext.getRollerContext().getServletContext(),
- RollerContext.getRollerContext().getAbsoluteContextUrl(),
+ RollerContext.getRollerContext().getAbsoluteContextUrl(request),
new VelocityContext());
Iterator it = plugins.values().iterator();
while (it.hasNext()) list.add(it.next());
Modified: incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryContentTag.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryContentTag.java?rev=405821&r1=405820&r2=405821&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryContentTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryContentTag.java Fri May 12 11:23:13 2006
@@ -71,9 +71,8 @@
try {
PagePluginManager ppmgr = roller.getPagePluginManager();
Map plugins = ppmgr.createAndInitPagePlugins(
- entry.getWebsite(),
- rctx.getServletContext(),
- rctx.getAbsoluteContextUrl(),
+ entry.getWebsite(), rctx.getServletContext(),
+ rctx.getAbsoluteContextUrl((HttpServletRequest)pageContext.getRequest()),
new VelocityContext());
xformed = ppmgr.applyPagePlugins(
entry, plugins, entry.getText(), singleEntry);
Modified: incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntrySummaryTag.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntrySummaryTag.java?rev=405821&r1=405820&r2=405821&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntrySummaryTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntrySummaryTag.java Fri May 12 11:23:13 2006
@@ -69,7 +69,7 @@
Map plugins = ppmgr.createAndInitPagePlugins(
entry.getWebsite(),
rctx.getServletContext(),
- rctx.getAbsoluteContextUrl(),
+ rctx.getAbsoluteContextUrl((HttpServletRequest)pageContext.getRequest()),
new VelocityContext());
xformed = ppmgr.applyPagePlugins(
entry, plugins, entry.getSummary(), true);
Modified: incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryTextTag.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryTextTag.java?rev=405821&r1=405820&r2=405821&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryTextTag.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/presentation/weblog/tags/ShowEntryTextTag.java Fri May 12 11:23:13 2006
@@ -85,7 +85,7 @@
Map plugins = ppmgr.createAndInitPagePlugins(
entry.getWebsite(),
rctx.getServletContext(),
- rctx.getAbsoluteContextUrl(),
+ rctx.getAbsoluteContextUrl(request),
new VelocityContext());
xformed = ppmgr.applyPagePlugins(entry, plugins, sourceText, true);