diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-08-04 09:40:17 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2005-08-04 09:40:17 +0000 |
| commit | dff2159b9a60ef198230c8ccf4cec127b5fc5a12 (patch) | |
| tree | 270861ea0148ceb55c4973ef8363ae76de3738a4 /wp-inst/wp-admin/admin-functions.php | |
| parent | b7f07ae4d07cf7e6990b85969575e95d892ac86d (diff) | |
| download | wordpress-mu-dff2159b9a60ef198230c8ccf4cec127b5fc5a12.tar.gz wordpress-mu-dff2159b9a60ef198230c8ccf4cec127b5fc5a12.tar.xz wordpress-mu-dff2159b9a60ef198230c8ccf4cec127b5fc5a12.zip | |
Changes from Core WP. Added tinymce editor and other fixes
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@120 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-admin/admin-functions.php')
| -rw-r--r-- | wp-inst/wp-admin/admin-functions.php | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/wp-inst/wp-admin/admin-functions.php b/wp-inst/wp-admin/admin-functions.php index c0d8a9e..1be7991 100644 --- a/wp-inst/wp-admin/admin-functions.php +++ b/wp-inst/wp-admin/admin-functions.php @@ -393,14 +393,16 @@ function get_nested_categories($default = 0, $parent = 0) { $cats = return_categories_list($parent); $result = array(); - foreach($cats as $cat) { - $result[$cat]['children'] = get_nested_categories($default, $cat); - $result[$cat]['cat_ID'] = $cat; - $result[$cat]['checked'] = in_array($cat, $checked_categories); - $result[$cat]['cat_name'] = get_the_category_by_ID($cat); - } + if ( is_array( $cats ) ) { + foreach($cats as $cat) { + $result[$cat]['children'] = get_nested_categories($default, $cat); + $result[$cat]['cat_ID'] = $cat; + $result[$cat]['checked'] = in_array($cat, $checked_categories); + $result[$cat]['cat_name'] = get_the_category_by_ID($cat); + } + } - return $result; + return $result; } function write_nested_categories($categories) { @@ -1200,7 +1202,7 @@ function get_real_file_to_edit($file) { $wp_file_descriptions = array( - 'index.php' => __('Main Template'), + 'index.php' => __('Main Index Template'), 'style.css' => __('Stylesheet'), 'comments.php' => __('Comments Template'), 'comments-popup.php' => __('Popup Comments Template'), |