diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-10-28 13:56:26 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-10-28 13:56:26 +0000 |
| commit | da1de1df9f3efe7a08901ea83b9e011637997140 (patch) | |
| tree | 41f04f0099dfc35ac62d341833055997d540f0a2 /modules | |
| parent | 0f3735800384b8e2257c72a02b30b1cbe7371b95 (diff) | |
| download | brdo-da1de1df9f3efe7a08901ea83b9e011637997140.tar.gz brdo-da1de1df9f3efe7a08901ea83b9e011637997140.tar.bz2 | |
- Patch #35205 by stefan: removed some deprecated code from forum.module! Yay.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/forum.module | 19 | ||||
| -rw-r--r-- | modules/forum/forum.module | 19 |
2 files changed, 6 insertions, 32 deletions
diff --git a/modules/forum.module b/modules/forum.module index d50dcbc00..bd992b2a2 100644 --- a/modules/forum.module +++ b/modules/forum.module @@ -239,7 +239,7 @@ function _forum_parent_select($tid, $title, $child_type) { if ($tree) { foreach ($tree as $term) { if (!in_array($term->tid, $exclude)) { - $options[$term->tid] = _forum_depth($term->depth).$term->name; + $options[$term->tid] = _taxonomy_depth($term->depth) . $term->name; } } } @@ -263,10 +263,10 @@ function forum_overview() { if ($tree) { foreach ($tree as $term) { if (in_array($term->tid, variable_get('forum_containers', array()))) { - $rows[] = array(_forum_depth($term->depth) .' '. check_plain($term->name), l(t('edit container'), "admin/forum/edit/container/$term->tid")); + $rows[] = array(_taxonomy_depth($term->depth) .' '. check_plain($term->name), l(t('edit container'), "admin/forum/edit/container/$term->tid")); } else { - $rows[] = array(_forum_depth($term->depth) .' '. check_plain($term->name), l(t('edit forum'), "admin/forum/edit/forum/$term->tid")); + $rows[] = array(_taxonomy_depth($term->depth) .' '. check_plain($term->name), l(t('edit forum'), "admin/forum/edit/forum/$term->tid")); } } @@ -278,19 +278,6 @@ function forum_overview() { } /** - * Helper function used to generate indentation for forum list - * - * @param $depth Depth of the indentation - * @param $graphic HTML text to be repeated for each stage of depth - */ -function _forum_depth($depth, $graphic = '--') { - for ($n = 0; $n < $depth; $n++) { - $result .= $graphic; - } - return $result; -} - -/** * Returns the vocabulary id for forum navigation. */ function _forum_get_vid() { diff --git a/modules/forum/forum.module b/modules/forum/forum.module index d50dcbc00..bd992b2a2 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -239,7 +239,7 @@ function _forum_parent_select($tid, $title, $child_type) { if ($tree) { foreach ($tree as $term) { if (!in_array($term->tid, $exclude)) { - $options[$term->tid] = _forum_depth($term->depth).$term->name; + $options[$term->tid] = _taxonomy_depth($term->depth) . $term->name; } } } @@ -263,10 +263,10 @@ function forum_overview() { if ($tree) { foreach ($tree as $term) { if (in_array($term->tid, variable_get('forum_containers', array()))) { - $rows[] = array(_forum_depth($term->depth) .' '. check_plain($term->name), l(t('edit container'), "admin/forum/edit/container/$term->tid")); + $rows[] = array(_taxonomy_depth($term->depth) .' '. check_plain($term->name), l(t('edit container'), "admin/forum/edit/container/$term->tid")); } else { - $rows[] = array(_forum_depth($term->depth) .' '. check_plain($term->name), l(t('edit forum'), "admin/forum/edit/forum/$term->tid")); + $rows[] = array(_taxonomy_depth($term->depth) .' '. check_plain($term->name), l(t('edit forum'), "admin/forum/edit/forum/$term->tid")); } } @@ -278,19 +278,6 @@ function forum_overview() { } /** - * Helper function used to generate indentation for forum list - * - * @param $depth Depth of the indentation - * @param $graphic HTML text to be repeated for each stage of depth - */ -function _forum_depth($depth, $graphic = '--') { - for ($n = 0; $n < $depth; $n++) { - $result .= $graphic; - } - return $result; -} - -/** * Returns the vocabulary id for forum navigation. */ function _forum_get_vid() { |