diff options
| author | Dries Buytaert <dries@buytaert.net> | 2002-04-24 20:55:20 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2002-04-24 20:55:20 +0000 |
| commit | 681dfc4ac04a2e2f9f845abc2506cf28354d0c05 (patch) | |
| tree | 769daf235eb955f697781d66c729d48af5d4fb1b | |
| parent | be5f1d2e9dcb040045826ff5829691cf72daa3dc (diff) | |
| download | brdo-681dfc4ac04a2e2f9f845abc2506cf28354d0c05.tar.gz brdo-681dfc4ac04a2e2f9f845abc2506cf28354d0c05.tar.bz2 | |
- Bugfix: solve problem with locales being "disabled". Reported by Jerritt,
fixed by Marco.
| -rw-r--r-- | includes/common.inc | 3 | ||||
| -rw-r--r-- | modules/block.module | 2 | ||||
| -rw-r--r-- | modules/block/block.module | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/includes/common.inc b/includes/common.inc index 881cb06cd..37a999d31 100644 --- a/includes/common.inc +++ b/includes/common.inc @@ -115,6 +115,9 @@ function locale_init() { function t($string, $args = 0) { global $languages; + + $string = ($languages && function_exists("locale") ? locale($string) : $string); + if (!$args) { return $string; } diff --git a/modules/block.module b/modules/block.module index 3effe0fd5..72c59cea4 100644 --- a/modules/block.module +++ b/modules/block.module @@ -34,7 +34,7 @@ function block_admin_display() { $result = db_query("SELECT * FROM blocks ORDER BY module"); // Generate output: - $output .= "<form action=\"". drupal_url(array("mod" => "block"), "admin") ." method=\"post\">\n"; + $output .= "<form action=\"". drupal_url(array("mod" => "block"), "admin") ."\" method=\"post\">\n"; $output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n"; $output .= " <tr><th>block</th><th>module</th><th>status</th><th>weight</th><th>region</th><th>path</th></tr>\n"; diff --git a/modules/block/block.module b/modules/block/block.module index 3effe0fd5..72c59cea4 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -34,7 +34,7 @@ function block_admin_display() { $result = db_query("SELECT * FROM blocks ORDER BY module"); // Generate output: - $output .= "<form action=\"". drupal_url(array("mod" => "block"), "admin") ." method=\"post\">\n"; + $output .= "<form action=\"". drupal_url(array("mod" => "block"), "admin") ."\" method=\"post\">\n"; $output .= "<table border=\"1\" cellpadding=\"2\" cellspacing=\"2\">\n"; $output .= " <tr><th>block</th><th>module</th><th>status</th><th>weight</th><th>region</th><th>path</th></tr>\n"; |