diff --git a/print.module b/print.module
index ac5e0ec07fd33c06112a27b7cc5a25cfdef8b08f..db8580b204dc633a7e82597ac23fd15535a1139e 100644
--- a/print.module
+++ b/print.module
@@ -442,18 +442,18 @@ function _print_var_generator($node, $cid = NULL) {
$print["logo"] = $print["logo"] ? "\n" : "";
/* Grab and format the src URL */
+ if (empty($print_sourceurl_settings['forcenode'])) {
+ $print["url"] = url($path, NULL, NULL, TRUE);
+ }
+ else {
+ $print["url"] = $base_url .'/'. (((bool)variable_get('clean_url', '0')) ? '' : '?q=') . $path;
+ }
+ if ($cid) {
+ $print["url"] .= "#comment-$cid";
+ }
if ($print_sourceurl_settings['enabled'] == 1) {
- if (empty($print_sourceurl_settings['forcenode'])) {
- $print["source_url"] = url($path, NULL, NULL, TRUE);
- }
- else {
- $print["source_url"] = $base_url .'/'. (((bool)variable_get('clean_url', '0')) ? '' : '?q=') . $path;
- }
- if ($cid) {
- $print["source_url"] .= "#comment-$cid";
- }
$print["printdate"] = $print_sourceurl_settings['date'] ? (" (". $themed['retrieved'] ." ". format_date(time(), 'small') .")") : "";
- $print["source_url"] = "". $themed['sourceURL'] . $print["printdate"] .": ". $print["source_url"] ."";
+ $print["source_url"] = "". $themed['sourceURL'] . $print["printdate"] .": ". $print["url"] ."";
}
else {
$print["source_url"] = "";