diff options
| author | Dries Buytaert <dries@buytaert.net> | 2003-02-11 20:01:17 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2003-02-11 20:01:17 +0000 |
| commit | e90f3b883b0655ccba009f2fbef982696341a1a2 (patch) | |
| tree | 0afa31bda8e395e9addfadae4eb62067392abe20 /includes | |
| parent | 3d3a60740a63e8c803d0905b2727bb202e6de370 (diff) | |
| download | brdo-e90f3b883b0655ccba009f2fbef982696341a1a2.tar.gz brdo-e90f3b883b0655ccba009f2fbef982696341a1a2.tar.bz2 | |
- See http://lists.drupal.org/pipermail/drupal-devel/2003-February/021824.html.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/common.inc | 6 | ||||
| -rw-r--r-- | includes/pager.inc | 2 | ||||
| -rw-r--r-- | includes/theme.inc | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/includes/common.inc b/includes/common.inc index 05a9f4833..e67b0053f 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -664,10 +664,10 @@ function format_date($timestamp, $type = "medium", $format = "") { $date = date(variable_get("date_format", "m/d/Y - H:i"), $timestamp); break; case "medium": - $date = t(date("l", $timestamp)) .", ". date(variable_get("date_format", "m/d/Y - H:i"), $timestamp); + $date = date(variable_get("date_format_medium", "D, m/d/Y - H:i"), $timestamp); break; case "large": - $date = t(date("l", $timestamp)) .", ". t(date("F", $timestamp)) ." ". date("d, Y - H:i", $timestamp); + $date = date(variable_get("date_format_long", "l, F j, Y - H:i"), $timestamp); break; case "custom": for ($i = strlen($format); $i >= 0; $c = $format[--$i]) { @@ -683,7 +683,7 @@ function format_date($timestamp, $type = "medium", $format = "") { } break; default: - $date = t(date("l", $timestamp)) .", ". date(variable_get("date_format", "m/d/Y - H:i"), $timestamp); + $date = date(variable_get("date_format_medium", "l, m/d/Y - H:i"), $timestamp); } return $date; } diff --git a/includes/pager.inc b/includes/pager.inc index 4f6fe8877..abdfd9e95 100644 --- a/includes/pager.inc +++ b/includes/pager.inc @@ -17,7 +17,7 @@ * @return string html of pager */ function pager_display($tags = "", $limit = 10, $element = 0, $type = "default", $attributes = array()) { - return theme_invoke("pager_display_". $type, $tags, $limit, $element, $attributes = array()); + return theme("pager_display_". $type, $tags, $limit, $element, $attributes = array()); } /** diff --git a/includes/theme.inc b/includes/theme.inc index 7dba28dd1..cdca31948 100644 --- a/includes/theme.inc +++ b/includes/theme.inc @@ -169,13 +169,13 @@ function theme_blocks($region) { if ((($block->status && (!$user->uid || !$block->custom)) || ($block->custom && $user->block[$block->module][$block->delta])) && (!$block->path || preg_match("|$block->path|", $PHP_SELF))) { $block_data = module_invoke($block->module, "block", "view", $block->delta); if ($block_data["content"]) { - theme_invoke("block", $block_data["subject"], $block_data["content"], $region); + theme("block", $block_data["subject"], $block_data["content"], $region); } } } } -function theme_invoke() { +function theme() { global $theme; $args = func_get_args(); |