diff --git a/print.module b/print.module index 194c31117e200864aa19fb0fe5640aa1a2abd100..9507610838fb4918692883bfe1043e89b55cd6ab 100644 --- a/print.module +++ b/print.module @@ -341,8 +341,8 @@ function print_link($type, $node = NULL, $teaser = FALSE) { $query = print_query_string_encode($query_arr, array('q')); if (empty($query)) $query = NULL; - if ($print_html_link_use_alias) { - $path = drupal_get_path_alias('node/'. $node->nid); + if (($print_html_link_use_alias) && ($alias = drupal_lookup_path('alias', 'node/'. $node->nid))) { + $path = $alias; } else { $path = $node->nid; @@ -731,8 +731,8 @@ function print_insert_link($path = NULL, $node = NULL) { $path = 'book/export/html/'. $nid; } else { - if (variable_get('print_html_link_use_alias', PRINT_HTML_LINK_USE_ALIAS_DEFAULT)) { - $path = drupal_get_path_alias($path); + if (variable_get('print_html_link_use_alias', PRINT_HTML_LINK_USE_ALIAS_DEFAULT) && ($alias = drupal_lookup_path('alias', $path))) { + $path = $alias; } else { $path = $nid; diff --git a/print_mail/print_mail.module b/print_mail/print_mail.module index 752d10e6964ea2be7e412baab3e4bd499ed0bdfb..60af70d6c17f5f9cc032ea914dba2b773bc57d7d 100644 --- a/print_mail/print_mail.module +++ b/print_mail/print_mail.module @@ -159,8 +159,8 @@ function print_mail_link($type, $node = NULL, $teaser = FALSE) { $query = print_query_string_encode($query_arr, array('q')); if (empty($query)) $query = NULL; - if ($print_mail_link_use_alias) { - $path = drupal_get_path_alias('node/'. $node->nid); + if (($print_mail_link_use_alias) && ($alias = drupal_lookup_path('alias', 'node/'. $node->nid))) { + $path = $alias; } else { $path = $node->nid; @@ -407,8 +407,8 @@ function print_mail_insert_link($path = NULL, $node = NULL) { $path = 'book/export/html/'. $nid; } else { - if (variable_get('print_mail_link_use_alias', PRINT_MAIL_LINK_USE_ALIAS_DEFAULT)) { - $path = drupal_get_path_alias($path); + if (variable_get('print_mail_link_use_alias', PRINT_MAIL_LINK_USE_ALIAS_DEFAULT) && ($alias = drupal_lookup_path('alias', $path))) { + $path = $alias; } else { $path = $nid; diff --git a/print_pdf/print_pdf.module b/print_pdf/print_pdf.module index a88f4546477bdf4e84604337e9cd47c3a81ac435..04605d15b9532e09258348b8f82950d6294a8030 100644 --- a/print_pdf/print_pdf.module +++ b/print_pdf/print_pdf.module @@ -291,8 +291,8 @@ function print_pdf_link($type, $node = NULL, $teaser = FALSE) { $query = print_query_string_encode($query_arr, array('q')); if (empty($query)) $query = NULL; - if ($print_pdf_link_use_alias) { - $path = drupal_get_path_alias('node/'. $node->nid); + if (($print_pdf_link_use_alias) && ($alias = drupal_lookup_path('alias', 'node/'. $node->nid))) { + $path = $alias; } else { $path = $node->nid; @@ -492,8 +492,8 @@ function print_pdf_insert_link($path = NULL, $node = NULL) { $path = 'book/export/html/'. $nid; } else { - if (variable_get('print_pdf_link_use_alias', PRINT_PDF_LINK_USE_ALIAS_DEFAULT)) { - $path = drupal_get_path_alias($path); + if (variable_get('print_pdf_link_use_alias', PRINT_PDF_LINK_USE_ALIAS_DEFAULT) && ($alias = drupal_lookup_path('alias', $path))) { + $path = $alias; } else { $path = $nid;