now using global function isUserBlocked()

changed code to run with snapshot 20020531-fc:
- removed explicit writing of prefix and suffix to response-object (helma's doing that from now on)
This commit is contained in:
Robert Gaggl 2002-06-02 15:56:44 +00:00
parent 6d1da6e53c
commit b167cce071

View file

@ -5,7 +5,6 @@
function title_macro(param) { function title_macro(param) {
if (!this.title && !param.as) if (!this.title && !param.as)
return; return;
res.write(param.prefix)
if (param.as == "editor") if (param.as == "editor")
this.renderInputText(this.createInputParam("title",param)); this.renderInputText(this.createInputParam("title",param));
else if (param.as == "link") { else if (param.as == "link") {
@ -22,7 +21,6 @@ function title_macro(param) {
this.story.closeLink(); this.story.closeLink();
} else } else
res.write(this.title); res.write(this.title);
res.write(param.suffix);
} }
/** /**
@ -30,8 +28,7 @@ function title_macro(param) {
*/ */
function replylink_macro(param) { function replylink_macro(param) {
if (this.weblog.hasDiscussions() && !user.isBlocked() && req.action == "main") { if (this.weblog.hasDiscussions() && !isUserBlocked() && req.action == "main") {
res.write(param.prefix)
var linkParam = new Object(); var linkParam = new Object();
linkParam.linkto = "comment"; linkParam.linkto = "comment";
this.openLink(linkParam); this.openLink(linkParam);
@ -40,7 +37,6 @@ function replylink_macro(param) {
else else
this.renderImage(param); this.renderImage(param);
this.closeLink(); this.closeLink();
res.write(param.suffix);
} }
} }
@ -49,8 +45,6 @@ function replylink_macro(param) {
*/ */
function url_macro(param) { function url_macro(param) {
res.write(param.prefix);
res.write(this.story.href() + "#" + this._id); res.write(this.story.href() + "#" + this._id);
res.write(param.prefix);
} }