\n\n";
+ echo "\n\n";
+ echo "
\n\n";
- if ( !isset($wp_registered_widgets[$sidebar_widget_id]) || !is_array($wp_registered_widgets[$sidebar_widget_id]) ) {
- return $params;
- }
- $widget_defaults = array('id' => '', 'width' => '', 'height' => '', 'class' => '', 'feed_link' => '', 'all_link' => '', 'notice' => false, 'error' => false);
- extract( $widget_defaults, EXTR_PREFIX_ALL, 'widget' );
- extract( $wp_registered_widgets[$sidebar_widget_id], EXTR_PREFIX_ALL, 'widget' );
+ echo "\n";
+}
- $the_classes = array();
- if ( in_array($widget_width, array( 'third', 'fourth', 'full' ) ) )
- $the_classes[] = $widget_width;
+/* Dashboard Widgets */
- if ( 'double' == $widget_height )
- $the_classes[] = 'double';
-
- if ( $widget_class )
- $the_classes[] = $widget_class;
-
- // Add classes to the widget holder
- if ( $the_classes )
- $sidebar_before_widget = str_replace( "' . ( isset($widget_all_link[1]) ? $widget_all_link[1] : __( 'View All' ) ) . '';
- }
-
- $content_class = 'dashboard-widget-content';
- if ( current_user_can( 'edit_dashboard' ) && isset($wp_registered_widget_controls[$widget_id]) && is_callable($wp_registered_widget_controls[$widget_id]['callback']) ) {
- // Switch this widget to edit mode
- if ( isset($_GET['edit']) && $_GET['edit'] == $widget_id ) {
- $content_class .= ' dashboard-widget-control';
- $wp_registered_widgets[$widget_id]['callback'] = 'wp_dashboard_empty';
- $sidebar_widget_name = $wp_registered_widget_controls[$widget_id]['name'];
- $params[1] = 'wp_dashboard_trigger_widget_control';
- $sidebar_before_widget .= '$sidebar_after_widget";
- $top_links[] = '' . __( 'Cancel' ) . '';
+function wp_dashboard_quick_press( $dashboard, $meta_box ) {
+ $drafts = false;
+ if ( 'post' === strtolower( $_SERVER['REQUEST_METHOD'] ) && isset( $_POST['action'] ) && 0 === strpos( $_POST['action'], 'post-quickpress' ) ) {
+ $view = get_permalink( $_POST['post_ID'] );
+ $edit = clean_url( get_edit_post_link( $_POST['post_ID'] ) );
+ if ( 'post-quickpress-publish' == $_POST['action'] ) {
+ printf( __( 'Post Published. View post | Edit post' ), clean_url( $view ), $edit );
} else {
- $top_links[] = '' . __( 'Edit' ) . '';
+ printf( __( 'Draft Saved. Preview post | Edit post' ), clean_url( add_query_arg( 'preview', 1, $view ) ), $edit );
+ $drafts_query = new WP_Query( array(
+ 'post_type' => 'post',
+ 'what_to_show' => 'posts',
+ 'post_status' => 'draft',
+ 'author' => $GLOBALS['current_user']->ID,
+ 'posts_per_page' => 1,
+ 'orderby' => 'modified',
+ 'order' => 'DESC'
+ ) );
+
+ if ( $drafts_query->posts )
+ $drafts =& $drafts_query->posts;
}
+ $_REQUEST = array(); // hack for get_default_post_to_edit()
}
- if ( $widget_feed_link )
- $bottom_links[] = ' . ')
' . __( 'RSS' ) . '';
-
- $bottom_links = apply_filters( "wp_dashboard_widget_links_$widget_id", $bottom_links );
-
- // Could have put this in widget-content. Doesn't really matter
- if ( $widget_notice )
- $sidebar_after_title .= "\t\t\t\n\n";
-
- if ( $widget_error )
- $sidebar_after_title .= "\t\t\t\n\n";
-
- $sidebar_after_title .= "\t\t\t
+ false, 'show_summary' => false, 'show_author' => false ) );
+}
+
+function wp_dashboard_primary() {
+ wp_dashboard_cached_rss_widget( 'dashboard_primary', 'wp_dashboard_rss_output' );
+}
+
+function wp_dashboard_primary_control() {
+ wp_dashboard_rss_control( 'dashboard_primary' );
+}
+
/**
* {@internal Missing Short Description}}
*
- * $sidebar_args are handled by wp_dashboard_empty().
- *
* @since unknown
*
* @param int $widget_id
@@ -579,11 +454,17 @@
wp_widget_rss_output( $widgets[$widget_id] );
}
+function wp_dashboard_secondary() {
+ wp_dashboard_cached_rss_widget( 'dashboard_secondary', 'wp_dashboard_secondary_output' );
+}
+
+function wp_dashboard_secondary_control() {
+ wp_dashboard_rss_control( 'dashboard_secondary', array( 'show_summary' => false, 'show_author' => false, 'show_date' => false ) );
+}
+
/**
* Display secondary dashboard RSS widget feed.
*
- * $sidebar_args are handled by wp_dashboard_empty().
- *
* @since unknown
*
* @return unknown
@@ -609,11 +490,17 @@
echo "\n ' . __( 'RSS' ) . '';
-
- $bottom_links = apply_filters( "wp_dashboard_widget_links_$widget_id", $bottom_links );
-
- // Could have put this in widget-content. Doesn't really matter
- if ( $widget_notice )
- $sidebar_after_title .= "\t\t\t\n\n";
-
- if ( $widget_error )
- $sidebar_after_title .= "\t\t\t\n\n";
-
- $sidebar_after_title .= "\t\t\t\n\n";
-
- // Add links to widget's title bar
- if ( $top_links ) {
- $sidebar_before_title .= '';
- $sidebar_after_title = '' . join( ' | ', $top_links ) . "
$sidebar_after_title"; - } - - // Add links to bottom of widget - if ( $bottom_links ) - $sidebar_after_widget .= ""; - - $sidebar_after_widget .= "\t\t\t
\n\n";
-
- foreach( array_keys( $params[0] ) as $key )
- $$key = ${'sidebar_' . $key};
-
- $params[0] = compact( array_keys( $params[0] ) );
-
- return $params;
-}
-
-
-/* Dashboard Widgets */
-
-function wp_dashboard_quick_press( $sidebar_args ) {
- extract( $sidebar_args, EXTR_SKIP );
-
- echo $before_widget;
-
- echo $before_title;
- echo $widget_name;
- echo $after_title;
-
- if ( ( 'post' === strtolower( $_SERVER['REQUEST_METHOD'] ) ) && 'post-quickpress-save-cont' === $_POST['action'] ) {
- $post = get_post_to_edit( $_POST['post_ID'] );
- } else {
- $_REQUEST = array(); // hack
- $post = get_default_post_to_edit();
- }
+ $post = get_default_post_to_edit();
?>
+
'post',
- 'what_to_show' => 'posts',
- 'post_status' => 'draft',
- 'author' => $GLOBALS['current_user']->ID,
- 'posts_per_page' => 5,
- 'orderby' => 'modified',
- 'order' => 'DESC'
- ) );
+ if ( $drafts )
+ wp_dashboard_recent_drafts( $drafts );
+}
- if ( $drafts_query->posts ) :
+function wp_dashboard_recent_drafts( $drafts = false ) {
+ if ( !$drafts ) {
+ $drafts_query = new WP_Query( array(
+ 'post_type' => 'post',
+ 'what_to_show' => 'posts',
+ 'post_status' => 'draft',
+ 'author' => $GLOBALS['current_user']->ID,
+ 'posts_per_page' => 5,
+ 'orderby' => 'modified',
+ 'order' => 'DESC'
+ ) );
+ $drafts =& $drafts_query->posts;
+ }
+
+ if ( $drafts && is_array( $drafts ) ) :
$list = array();
- foreach ( $drafts_query->posts as $draft ) {
+ foreach ( $drafts as $draft ) {
$url = get_edit_post_link( $draft->ID );
$title = _draft_or_post_title( $draft->ID );
$list[] = "$title";
}
?>
+ $sidebar_after_title"; - } - - // Add links to bottom of widget - if ( $bottom_links ) - $sidebar_after_widget .= ""; - - $sidebar_after_widget .= "\t\t\t
-
+
- \n
- ", $list ); ?> +
- -
- - + +
- echo $after_widget;
-}
+
-function wp_dashboard_quick_press_js() {
+
-
-comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
+ $approve_url = clean_url( wp_nonce_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "approve-comment_$comment->comment_ID" ) );
+ $unapprove_url = clean_url( wp_nonce_url( "comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID", "unapprove-comment_$comment->comment_ID" ) );
+ $spam_url = clean_url( wp_nonce_url( "comment.php?action=deletecomment&dt=spam&p=$comment->comment_post_ID&c=$comment->comment_ID", "delete-comment_$comment->comment_ID" ) );
-/**
- * Display recent comments dashboard widget content.
- *
- * @since unknown
- *
- * @param unknown_type $sidebar_args
- */
-function wp_dashboard_recent_comments( $sidebar_args ) {
- global $comment;
- extract( $sidebar_args, EXTR_SKIP );
+ $actions = array();
- echo $before_widget;
+ if ( current_user_can('edit_post', $comment->comment_post_ID) ) {
+ $actions['approve'] = "" . __( 'Approve' ) . '';
+ $actions['unapprove'] = "" . __( 'Unapprove' ) . '';
+ $actions['edit'] = "". __('Edit') . '';
+ $actions['spam'] = "" . __( 'Spam' ) . '';
+ $actions['delete'] = "" . __('Delete') . '';
+ $actions['reply'] = '' . __('Reply') . '';
- echo $before_title;
- echo $widget_name;
- echo $after_title;
+ $actions = apply_filters( 'comment_row_actions', $actions, $comment );
- $lambda = create_function( '', 'return 5;' );
- add_filter( 'option_posts_per_rss', $lambda ); // hack - comments query doesn't accept per_page parameter
- $comments_query = new WP_Query(array('feed' => 'rss2', 'withcomments' => 1));
- remove_filter( 'option_posts_per_rss', $lambda );
+ $i = 0;
+ $actions_string = '';
+ foreach ( $actions as $action => $link ) {
+ ++$i;
+ ( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
- $is_first = true;
+ // Reply and quickedit need a hide-if-no-js span
+ if ( 'reply' == $action || 'quickedit' == $action )
+ $action .= ' hide-if-no-js';
- if ( $comments_query->have_comments() ) {
- while ( $comments_query->have_comments() ) { $comments_query->the_comment();
+ $actions_string .= "$sep$link";
+ }
+ }
- $comment_post_url = get_permalink( $comment->comment_post_ID );
- $comment_post_title = get_the_title( $comment->comment_post_ID );
- $comment_post_link = "$comment_post_title";
- $comment_link = '#';
- $comment_meta = sprintf( __( 'From %1$s on %2$s %3$s' ), get_comment_author(), $comment_post_link, $comment_link );
-
- if ( $is_first ) : $is_first = false;
?>
- - -comment_count > 1 ) : ?> -“”
-
-
-
-comment_ID; ?>" >
+ comment_type || 'comment' == $comment->comment_type ) : ?>
- if ( $comments_query->comment_count > 1 ) : ?>
-
+ +
\n"; } +function wp_dashboard_plugins() { + wp_dashboard_cached_rss_widget( 'dashboard_plugins', 'wp_dashboard_plugins_output', array( + 'http://wordpress.org/extend/plugins/rss/browse/popular/', + 'http://wordpress.org/extend/plugins/rss/browse/new/', + 'http://wordpress.org/extend/plugins/rss/browse/updated/' + ) ); +} + /** * Display plugins most popular, newest plugins, and recently updated widget text. * - * $sidebar_args are handled by wp_dashboard_empty(). - * * @since unknown */ function wp_dashboard_plugins_output() { @@ -713,38 +600,8 @@ return true; } -/** - * Empty widget used for JS/AJAX created output. - * - * Callback inserts content between before_widget and after_widget. Used when - * widget is in edit mode. Can also be used for custom widgets. - * - * @since unknown - * - * @param array $sidebar_args - * @param callback $callback Optional. Only used in edit mode. - */ -function wp_dashboard_empty( $sidebar_args, $callback = false ) { - extract( $sidebar_args, EXTR_SKIP ); +/* Dashboard Widgets Controls */ - echo $before_widget; - - echo $before_title; - echo $widget_name; - echo $after_title; - - // When in edit mode, the callback passed to this function is the widget_control callback - if ( $callback && is_callable( $callback ) ) { - $args = array_slice( func_get_args(), 2 ); - array_unshift( $args, $widget_id ); - call_user_func_array( $callback, $args ); - } - - echo $after_widget; -} - -/* Dashboard Widgets Controls. See also wp_dashboard_empty() */ - // Temp function wp_dashboard_empty_control() { echo "This feature isn't enabled in this prototype."; @@ -759,9 +616,11 @@ * @param int $widget_control_id Registered Widget ID. */ function wp_dashboard_trigger_widget_control( $widget_control_id = false ) { - global $wp_registered_widget_controls; - if ( is_scalar($widget_control_id) && $widget_control_id && isset($wp_registered_widget_controls[$widget_control_id]) && is_callable($wp_registered_widget_controls[$widget_control_id]['callback']) ) - call_user_func_array( $wp_registered_widget_controls[$widget_control_id]['callback'], $wp_registered_widget_controls[$widget_control_id]['params'] ); + global $wp_dashboard_control_callbacks; + + if ( is_scalar($widget_control_id) && $widget_control_id && isset($wp_dashboard_control_callbacks[$widget_control_id]) && is_callable($wp_dashboard_control_callbacks[$widget_control_id]) ) { + call_user_func( $wp_dashboard_control_callbacks[$widget_control_id], '', array( 'id' => $widget_control_id, 'callback' => $wp_dashboard_control_callbacks[$widget_control_id] ) ); + } } /** @@ -772,14 +631,10 @@ * * @since unknown * - * @param array $args Expects 'widget_id' and 'form_inputs'. - * @return bool|null False if no widget_id is given. Null on success. + * @param string widget_id + * @param array form_inputs */ -function wp_dashboard_rss_control( $args ) { - extract( $args ); - if ( !$widget_id ) - return false; - +function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) { if ( !$widget_options = get_option( 'dashboard_widget_options' ) ) $widget_options = array(); Index: wp-admin/includes/template.php =================================================================== --- wp-admin/includes/template.php (revision 9102) +++ wp-admin/includes/template.php (working copy) @@ -2058,7 +2058,7 @@ * @param unknown_type $checkbox * @param unknown_type $mode */ -function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single') { +function wp_comment_reply($position = '1', $checkbox = false, $mode = 'single', $table_row = true) { global $current_user; // allow plugin to replace the popup content @@ -2069,8 +2069,12 @@ return; } ?> - + +
 ) . 'wp-admin/images/new-window-icon.gif'; ?>){kind=icon}