summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoao Ventura2008-06-04 11:34:43 (GMT)
committer Joao Ventura2008-06-04 11:34:43 (GMT)
commitf2015a87f9ab76ffcb6e23efe5e8ed4148ecbc3d (patch)
tree1f4610e57eaeddbdd4f45cb30b486399ca7d8758
parent54fb3a40a7c07c2a23709ebb5daaf5121090cb11 (diff)
Fix #266186 by aaustin: Use drupal_get_title to obtain the page title
Fix #266318 by sun: Use theme_image for the icons (also fix #262900)
-rw-r--r--print.module4
-rw-r--r--print.pages.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/print.module b/print.module
index 529c55a..7a0d6a3 100644
--- a/print.module
+++ b/print.module
@@ -223,7 +223,7 @@ function _print_format_link_aux($type = 0, $text = '', $img = '', $title = '', $
}
if ($type >= 2) {
- $img = '<img width="16px" height="16px" style="vertical-align:middle" src="'. $img .'" alt="'. $text .'" />';
+ $img = theme('image', $img, $text, '', array('style' => 'vertical-align: middle'));
$html = TRUE;
switch ($type) {
case 2:
@@ -254,7 +254,7 @@ function _print_format_link_aux($type = 0, $text = '', $img = '', $title = '', $
function theme_print_format_link() {
$print_settings = variable_get('print_settings', print_settings_default());
$text = t('Printer-friendly version');
- $img = base_path() . drupal_get_path('module', 'print') .'/icons/print_icon.gif';
+ $img = drupal_get_path('module', 'print') .'/icons/print_icon.gif';
$title = t('Display a printer-friendly version of this page.');
$class = 'print-page';
$format = _print_format_link_aux($print_settings['show_link'], $text, $img, $title, $class);
diff --git a/print.pages.inc b/print.pages.inc
index 1727eed..5aa0732 100644
--- a/print.pages.inc
+++ b/print.pages.inc
@@ -494,7 +494,7 @@ function _print_generate_path($path) {
// Adapted from index.php.
$node = new stdClass();
$node->body = menu_execute_active_handler();
- $node->title = menu_get_active_title();
+ $node->title = drupal_get_title();
$node->path = $path;
// It may happen that a drupal_not_found is called in the above call