diff --git a/print.admin.inc b/print.admin.inc index 40b445a63d77a473dd28dddbc564f4cc92f95792..2f496648cc333cfd0fad804dd65b8a9bab1b7245 100644 --- a/print.admin.inc +++ b/print.admin.inc @@ -35,7 +35,7 @@ function print_main_settings() { '#title' => t('Printer-friendly URLs list'), '#default_value' => variable_get('print_urls', PRINT_URLS_DEFAULT), '#description' => t('If set, a list of the destination URLs for the page links will be displayed at the bottom of the page.') .'
'. - t('Note that you can enable/disable the URL list for each content type individually from the !url.', array('!url' => l(t('Content Types page'),'admin/content/types'))), + t('Note that you can enable/disable the URL list for each content type individually from the !url.', array('!url' => l(t('Content Types page'), 'admin/content/types'))), ); $form['settings']['print_comments'] = array( diff --git a/print.install b/print.install index 883bfbdb56832069586aa67bfe42e931993496a5..db49e6fec1b8974a2b8b56b4b182cd017d5cda28 100644 --- a/print.install +++ b/print.install @@ -46,7 +46,7 @@ function print_install() { $t = get_t(); drupal_set_message($t('Printer-friendly Page settings are available under !link', - array( '!link' => l('Administer > Site configuration > Printer-friendly Pages ', 'admin/settings/print' ) ) + array( '!link' => l($t('Administer > Site configuration > Printer-friendly Pages'), 'admin/settings/print' ) ) )); } diff --git a/print.module b/print.module index 8189271c088fcbbbf4363104dbd7a035024618a2..c6181ada4927648d18b2ed031cb598ea5f6d1c33 100644 --- a/print.module +++ b/print.module @@ -259,9 +259,6 @@ function print_nodeapi(&$node, $op = 'view', $teaser, $page) { switch ($op) { case 'view': // Insert content corner links - if ($teaser === FALSE) { - _print_set_node_fields($node); - } $print_html_link_pos = variable_get('print_html_link_pos', array(PRINT_HTML_LINK_POS_DEFAULT => PRINT_HTML_LINK_POS_DEFAULT)); if (($teaser === FALSE) && !empty($print_html_link_pos['corner']) && (preg_match('!^print!i', $_GET['q']) == 0)) { @@ -274,7 +271,7 @@ function print_nodeapi(&$node, $op = 'view', $teaser, $page) { } } break; - case 'prepare': + case 'load': _print_set_node_fields($node); break; case 'update': @@ -727,52 +724,3 @@ function print_query_string_encode($query, $exclude = array(), $parent = '') { return implode('&', $params); } - -/** - * Implementation of hook_content_build_modes() - * - * @return - * An array describing the build modes used by the module. - * They are grouped by secondary tabs on CCK's 'Display fields' screens. - * - * Expected format: - * array( - * // The first level keys (tab1_url, tab2_url) will be used to generate - * // the url of the tab: admin/content/node-type/[type_name]/display/[tab1_url] - * // A module can add its render modes to a tab defined by another module. - * // In this case, there's no need to provide a 'title' for this tab. - * 'tab1_url' => array( - * 'title' => t('The human-readable title of the tab'), - * 'build modes' => array( - * // The keys of the 'context' array are the values used in $node->build_mode. - * 'mymodule_mode1' => array( - * 'title' => t('The human-readable name of the build mode'), - * // The 'views style' property determines if the render mode should be - * // available as an option in Views' 'node' row style (not implemented yet). - * 'views style' => TRUE, - * ), - * 'mymodule_mode2' => array( - * 'title' => t('Mode 2'), - * 'views style' => TRUE, - * ), - * ), - * ), - * 'tab2_url' => array( - * // ... - * ), - * ); - */ -function print_content_build_modes() { - return array( - 'print' => array( - 'title' => t('Print'), - 'build modes' => array( - 'print' => array( - 'title' => t('Print'), - 'views style' => FALSE, - ), - ), - ), - ); -} - diff --git a/print.pages.inc b/print.pages.inc index 27243e219494c377205e7bb5d304f1fa4abe0a12..0fdb84c8aa68ccda5ee7679e4f108f08f431155f 100644 --- a/print.pages.inc +++ b/print.pages.inc @@ -554,11 +554,8 @@ function _print_generate_node($nid, $cid = NULL, $format = PRINT_HTML_FORMAT, $t drupal_set_title($node->title); //alert other modules that we are generating a printer-friendly page, so they can choose to show/hide info - // TODO: Remove this in favor of PRINT_BUILD_MODE $node->printing = TRUE; - - $node->build_mode = 'print'; - + // Turn off Pagination by the Paging module unset($node->pages); unset($node->pages_count); diff --git a/print_mail/print_mail.module b/print_mail/print_mail.module index 903a9a03f8b0b0f05d56668681f345e9122f3ea6..d3e69d7b7383a83091b2140b99dae011f4a294bf 100644 --- a/print_mail/print_mail.module +++ b/print_mail/print_mail.module @@ -166,9 +166,6 @@ function print_mail_nodeapi(&$node, $op = 'view', $teaser, $page) { switch ($op) { case 'view': // Insert content corner links - if ($teaser === FALSE) { - _print_mail_set_node_fields($node); - } $print_mail_link_pos = variable_get('print_mail_link_pos', array(PRINT_MAIL_LINK_POS_DEFAULT => PRINT_MAIL_LINK_POS_DEFAULT)); if (($teaser === FALSE) && !empty($print_mail_link_pos['corner']) && (preg_match('!^print!i', $_GET['q']) == 0)) { @@ -181,7 +178,7 @@ function print_mail_nodeapi(&$node, $op = 'view', $teaser, $page) { } } break; - case 'prepare': + case 'load': _print_mail_set_node_fields($node); break; case 'update': diff --git a/print_pdf/print_pdf.module b/print_pdf/print_pdf.module index 7cde9afee319eae98f082720d9e4794c09616afc..bd647d6fcd1a7c748866fb864af4eaac7f34113d 100644 --- a/print_pdf/print_pdf.module +++ b/print_pdf/print_pdf.module @@ -192,9 +192,6 @@ function print_pdf_nodeapi(&$node, $op = 'view', $teaser, $page) { switch ($op) { case 'view': // Insert content corner links - if ($teaser === FALSE) { - _print_pdf_set_node_fields($node); - } $print_pdf_link_pos = variable_get('print_pdf_link_pos', array(PRINT_PDF_LINK_POS_DEFAULT => PRINT_PDF_LINK_POS_DEFAULT)); if (($teaser === FALSE) && !empty($print_pdf_link_pos['corner']) && (preg_match('!^print!i', $_GET['q']) == 0)) { @@ -207,7 +204,7 @@ function print_pdf_nodeapi(&$node, $op = 'view', $teaser, $page) { } } break; - case 'prepare': + case 'load': _print_pdf_set_node_fields($node); break; case 'update':