diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-26 12:57:25 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2007-01-26 12:57:25 +0000 |
| commit | 8a8560c1b75ce5cb9f3b86bf3cba19c6df5000ff (patch) | |
| tree | 9a697c0c3029c2b7a5223d818398c562346921e3 /wp-admin/admin-functions.php | |
| parent | c794c54fc14d1a4af6101ace58f8e60da2dc7d98 (diff) | |
| download | wordpress-mu-8a8560c1b75ce5cb9f3b86bf3cba19c6df5000ff.tar.gz wordpress-mu-8a8560c1b75ce5cb9f3b86bf3cba19c6df5000ff.tar.xz wordpress-mu-8a8560c1b75ce5cb9f3b86bf3cba19c6df5000ff.zip | |
WP Merge to rev 4813
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@868 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-admin/admin-functions.php')
| -rw-r--r-- | wp-admin/admin-functions.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index b274e67..83e0e74 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -840,7 +840,7 @@ function page_rows( $parent = 0, $level = 0, $pages = 0, $hierarchy = true ) { <?php echo $pad; ?><?php the_title() ?> </td> <td><?php the_author() ?></td> - <td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Unpublished'); else echo mysql2date( 'Y-m-d g:i a', $post->post_modified ); ?></td> + <td><?php if ( '0000-00-00 00:00:00' ==$post->post_modified ) _e('Unpublished'); else echo mysql2date( __('Y-m-d g:i a'), $post->post_modified ); ?></td> <td><a href="<?php the_permalink(); ?>" rel="permalink" class="edit"><?php _e( 'View' ); ?></a></td> <td><?php if ( current_user_can( 'edit_page', $id ) ) { echo "<a href='page.php?action=edit&post=$id' class='edit'>" . __( 'Edit' ) . "</a>"; } ?></td> <td><?php if ( current_user_can( 'delete_page', $id ) ) { echo "<a href='" . wp_nonce_url( "page.php?action=delete&post=$id", 'delete-page_' . $id ) . "' class='delete' onclick=\"return deleteSomething( 'page', " . $id . ", '" . js_escape(sprintf( __("You are about to delete the '%s' page.\n'OK' to delete, 'Cancel' to stop." ), get_the_title() ) ) . "' );\">" . __( 'Delete' ) . "</a>"; } ?></td> @@ -1615,7 +1615,7 @@ function get_file_description( $file ) { } elseif ( file_exists( ABSPATH . $file ) && is_file( ABSPATH . $file ) ) { $template_data = implode( '', file( ABSPATH . $file ) ); - if ( preg_match( "|Template Name:(.* )|i", $template_data, $name )) + if ( preg_match( "|Template Name:(.*)|i", $template_data, $name )) return $name[1]; } @@ -2232,7 +2232,6 @@ function wp_create_thumbnail( $file, $max_side, $effect = '' ) { } } - function update_blog_public($old_value, $value) { global $wpdb; $value = (int) $value; |