diff options
author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-05 17:45:26 +0000 |
---|---|---|
committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2006-10-05 17:45:26 +0000 |
commit | 767c3538b9f4aa2684429a7efea8f7728034c754 (patch) | |
tree | 8cc7b4bc82bfc8e5cc2179b7a8aa7b4f9a2be193 /wp-admin/admin-functions.php | |
parent | 23c0a299ada091cdeece968ad5cd3bdd20f5ef3c (diff) | |
download | wordpress-mu-767c3538b9f4aa2684429a7efea8f7728034c754.tar.gz wordpress-mu-767c3538b9f4aa2684429a7efea8f7728034c754.tar.xz wordpress-mu-767c3538b9f4aa2684429a7efea8f7728034c754.zip |
WP Merge to rev 4347
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@789 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/admin-functions.php')
-rw-r--r-- | wp-admin/admin-functions.php | 44 |
1 files changed, 27 insertions, 17 deletions
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 5c220a5..7eef22d 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -674,7 +674,7 @@ function dropdown_categories($default = 0) { function return_link_categories_list($parent = 0) { global $wpdb; - return $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent AND link_count > 0"); + return $wpdb->get_col("SELECT cat_ID FROM $wpdb->categories WHERE category_parent = $parent ORDER BY link_count DESC"); } function get_nested_link_categories( $default = 0, $parent = 0 ) { @@ -1720,25 +1720,23 @@ function get_plugins() { } } - if (!$plugins_dir || !$plugin_files) { + if ( !$plugins_dir || !$plugin_files ) return $wp_plugins; - } - - sort($plugin_files); - foreach ($plugin_files as $plugin_file) { - if ( !is_readable("$plugin_root/$plugin_file")) + foreach ( $plugin_files as $plugin_file ) { + if ( !is_readable("$plugin_root/$plugin_file") ) continue; $plugin_data = get_plugin_data("$plugin_root/$plugin_file"); - if (empty ($plugin_data['Name'])) { + if ( empty ($plugin_data['Name']) ) continue; - } $wp_plugins[plugin_basename($plugin_file)] = $plugin_data; } + uasort($wp_plugins, create_function('$a, $b', 'return strnatcasecmp($a["Name"], $b["Name"]);')); + return $wp_plugins; } @@ -1988,16 +1986,28 @@ function the_attachment_links($id = false) { $icon = get_attachment_icon($post->ID); ?> -<p><?php _e('Text linked to file') ?><br /> -<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><?php echo basename($post->guid) ?></a></textarea></p> -<p><?php _e('Text linked to subpost') ?><br /> -<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment" id="<?php echo $post->ID ?>"><?php echo $post->post_title ?></a></textarea></p> +<form id="the-attachment-links"> +<table> + <tr> + <th scope="row"><?php _e('Text linked to file') ?></th> + <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><?php echo basename($post->guid) ?></a></textarea></td> + </tr> + <tr> + <th scope="row"><?php _e('Text linked to subpost') ?></th> + <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment" id="<?php echo $post->ID ?>"><?php echo $post->post_title ?></a></textarea></td> + </tr> <?php if ( $icon ) : ?> -<p><?php _e('Thumbnail linked to file') ?><br /> -<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><?php echo $icon ?></a></textarea></p> -<p><?php _e('Thumbnail linked to subpost') ?><br /> -<textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment" id="<?php echo $post->ID ?>"><?php echo $icon ?></a></textarea></p> + <tr> + <th scope="row"><?php _e('Thumbnail linked to file') ?></th> + <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo $post->guid ?>" class="attachmentlink"><?php echo $icon ?></a></textarea></td> + </tr> + <tr> + <th scope="row"><?php _e('Thumbnail linked to subpost') ?></th> + <td><textarea rows="1" cols="40" type="text" class="attachmentlinks" readonly="readonly"><a href="<?php echo get_attachment_link($post->ID) ?>" rel="attachment" id="<?php echo $post->ID ?>"><?php echo $icon ?></a></textarea></td> + </tr> <?php endif; ?> +</table> +</form> <?php } |