Changeset 9716
- Timestamp:
- 11/15/2008 06:10:35 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/edit-form-advanced.php
r9711 r9716 161 161 $visibility = 'public'; 162 162 $visibility_trans = __('Public, Sticky'); 163 $sticky = 'sticky';164 163 } else { 165 164 $visibility = 'public'; -
trunk/wp-admin/edit-link-form.php
r9703 r9716 88 88 <?php 89 89 if ( !empty($_GET['action']) && 'edit' == $_GET['action'] && current_user_can('manage_links') ) { ?> 90 <a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo js_escape(sprintf( ('draft' == $post->post_status) ? __("You are about to delete this draft '%s'\n 'Cancel' to stop, 'OK' to delete.") :__("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a>90 <a class="submitdelete deletion" href="<?php echo wp_nonce_url("link.php?action=delete&link_id=$link->link_id", 'delete-bookmark_' . $link->link_id); ?>" onclick="if ( confirm('<?php echo js_escape(sprintf(__("You are about to delete this link '%s'\n 'Cancel' to stop, 'OK' to delete."), $link->link_name )); ?>') ) {return true;}return false;"><?php _e('Delete'); ?></a> 91 91 <?php } ?> 92 92 </div> -
trunk/wp-admin/import/blogger.php
r9506 r9716 523 523 524 524 function import_post( $entry ) { 525 global $ wpdb, $importing_blog;525 global $importing_blog; 526 526 527 527 // The old permalink is all Blogger gives us to link comments to their posts. … … 660 660 661 661 function get_user_options($current) { 662 global $ wpdb, $importer_users;662 global $importer_users; 663 663 if ( ! isset( $importer_users ) ) 664 664 $importer_users = (array) get_users_of_blog(); -
trunk/wp-admin/import/mt.php
r9369 r9716 56 56 57 57 function users_form($n) { 58 global $wpdb , $testing;58 global $wpdb; 59 59 $users = $wpdb->get_results("SELECT * FROM $wpdb->users ORDER BY ID"); 60 60 ?><select name="userselect[<?php echo $n; ?>]"> … … 102 102 //function to check the authorname and do the mapping 103 103 function checkauthor($author) { 104 global $wpdb;105 104 //mtnames is an array with the names in the mt import file 106 105 $pass = wp_generate_password(); … … 110 109 $user_id = username_exists($this->newauthornames[$this->j]); //check if the new author name defined by the user is a pre-existing wp user 111 110 if (!$user_id) { //banging my head against the desk now. 112 if ($ newauthornames[$this->j] == 'left_blank') { //check if the user does not want to change the authorname111 if ($this->newauthornames[$this->j] == 'left_blank') { //check if the user does not want to change the authorname 113 112 $user_id = wp_create_user($author, $pass); 114 113 $this->newauthornames[$this->j] = $author; //now we have a name, in the place of left_blank. -
trunk/wp-admin/includes/dashboard.php
r9710 r9716 354 354 355 355 function wp_dashboard_recent_drafts( $drafts = false ) { 356 global $post;357 356 if ( !$drafts ) { 358 357 $drafts_query = new WP_Query( array( -
trunk/wp-admin/includes/file.php
r9699 r9716 330 330 // You may define your own function and pass the name in $overrides['upload_error_handler'] 331 331 $upload_error_handler = 'wp_handle_upload_error'; 332 333 // You may define your own function and pass the name in $overrides['unique_filename_callback'] 334 $unique_filename_callback = null; 332 335 333 336 // $_POST['action'] must be set and its value must equal $overrides['action'] or this: -
trunk/wp-admin/includes/media.php
r9699 r9716 263 263 264 264 // Save the data 265 $id = wp_insert_attachment($attachment, $file, $post_ parent);265 $id = wp_insert_attachment($attachment, $file, $post_id); 266 266 if ( !is_wp_error($id) ) { 267 267 wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); … … 906 906 907 907 $edit_post = sanitize_post($post, 'edit'); 908 $file = wp_get_attachment_url($post->ID);909 $link = get_attachment_link($post->ID);910 908 911 909 $form_fields = array( … … 1020 1018 return false; 1021 1019 1022 $title_label = __('Title');1023 $description_label = __('Description');1024 $tags_label = __('Tags');1025 1026 1020 $toggle_on = __('Show'); 1027 1021 $toggle_off = __('Hide'); … … 1031 1025 $filename = basename($post->guid); 1032 1026 $title = attribute_escape($post->post_title); 1033 $description = attribute_escape($post->post_content); 1027 1034 1028 if ( $_tags = get_the_tags($attachment_id) ) { 1035 1029 foreach ( $_tags as $tag ) -
trunk/wp-admin/includes/plugin-install.php
r9700 r9716 28 28 */ 29 29 function plugins_api($action, $args = null) { 30 global $wp_version;31 30 32 31 if( is_array($args) ) … … 248 247 */ 249 248 function display_plugins_table($plugins, $page = 1, $totalpages = 1){ 250 global $tab;251 252 249 $type = isset($_REQUEST['type']) ? stripslashes( $_REQUEST['type'] ) : ''; 253 250 $term = isset($_REQUEST['s']) ? stripslashes( $_REQUEST['s'] ) : ''; … … 675 672 'activate_plugin' => '<a href="' . wp_nonce_url('plugins.php?action=activate&plugin=' . $plugin_file, 'activate-plugin_' . $plugin_file) . '" title="' . __('Activate this plugin') . '" target="_parent">' . __('Activate Plugin') . '</a>', 676 673 'plugins_page' => '<a href="' . admin_url('plugins.php') . '" title="' . __('Goto plugins page') . '" target="_parent">' . __('Return to Plugins page') . '</a>' 677 ), $plugin_information, $plugin_file);674 ), array(), $plugin_file); 678 675 if ( ! empty($install_actions) ) 679 676 show_message('<strong>' . __('Actions:') . '</strong> ' . implode(' | ', (array)$install_actions)); -
trunk/wp-admin/includes/post.php
r9701 r9716 770 770 */ 771 771 function wp_edit_posts_query( $q = false ) { 772 global $wpdb;773 772 if ( false === $q ) 774 773 $q = $_GET; … … 833 832 */ 834 833 function wp_edit_attachments_query( $q = false ) { 835 global $wpdb;836 834 if ( false === $q ) 837 835 $q = $_GET; -
trunk/wp-admin/includes/template.php
r9715 r9716 208 208 $hidden = array_intersect( array_keys( $columns ), array_filter( (array) get_user_option( "manage-$type-columns-hidden" ) ) ); 209 209 $col_count = count($columns) - count($hidden); 210 $output = '';?>210 ?> 211 211 212 212 <form method="get" action=""><table style="display: none"><tbody id="inlineedit"> … … 660 660 // convert it to table rows 661 661 $out = ''; 662 $class = '';663 662 $count = 0; 664 663 foreach( $tags as $tag ) … … 1880 1879 $comment = get_comment( $comment_id ); 1881 1880 $post = get_post($comment->comment_post_ID); 1882 $authordata = get_userdata($post->post_author);1883 1881 $the_comment_status = wp_get_comment_status($comment->comment_ID); 1884 1882 -
trunk/wp-admin/page.php
r9620 r9716 23 23 */ 24 24 function redirect_page($page_ID) { 25 global $action; 26 25 27 $referredby = ''; 26 28 if ( !empty($_POST['referredby']) ) { -
trunk/wp-includes/bookmark.php
r9699 r9716 30 30 $_bookmark = $bookmark; 31 31 } else { 32 if ( isset($GLOBALS['link']) && ($GLOBALS['link']->link_id == $ link) ) {32 if ( isset($GLOBALS['link']) && ($GLOBALS['link']->link_id == $bookmark) ) { 33 33 $_bookmark = & $GLOBALS['link']; 34 34 } elseif ( ! $_bookmark = wp_cache_get($bookmark, 'bookmark') ) { -
trunk/wp-includes/cron.php
r9407 r9716 159 159 */ 160 160 function spawn_cron( $local_time ) { 161 global $current_blog;162 161 163 162 /* -
trunk/wp-includes/http.php
r9575 r9716 412 412 $chunkLength = strlen( $match[0] ); 413 413 414 $strBody = substr($body, strlen( $match[0] ), $length);414 $strBody = substr($body, $chunkLength, $length); 415 415 $parsedBody .= $strBody; 416 416 -
trunk/wp-includes/pluggable.php
r9680 r9716 1513 1513 } 1514 1514 1515 if ( 'custom' == $default ) 1516 $default = add_query_arg( 's', $size, $defaults[$avatar_default][1] ); 1517 elseif ( 'mystery' == $default ) 1515 if ( 'mystery' == $default ) 1518 1516 $default = "http://www.gravatar.com/avatar/ad516503a11cd5ca435acc9bb6523536?s={$size}"; // ad516503a11cd5ca435acc9bb6523536 == md5('unknown@gravatar.com') 1519 1517 elseif ( 'blank' == $default ) … … 1525 1523 elseif ( empty($email) ) 1526 1524 $default = "http://www.gravatar.com/avatar/?d=$default&s={$size}"; 1525 else 1526 $default = add_query_arg( 's', $size, $default ); 1527 1527 1528 1528 if ( !empty($email) ) { -
trunk/wp-includes/plugin.php
r9611 r9716 124 124 * @since 0.71 125 125 * @global array $wp_filter Stores all of the filters 126 * @global array $merge _filters Merges the filter hooks using this function.126 * @global array $merged_filters Merges the filter hooks using this function. 127 127 * @global array $wp_current_filter stores the list of current filters with the current one last 128 128 * … … 220 220 */ 221 221 function remove_all_filters($tag, $priority = false) { 222 global $wp_filter, $merge _filters;222 global $wp_filter, $merged_filters; 223 223 224 224 if( isset($wp_filter[$tag]) ) { -
trunk/wp-includes/post.php
r9714 r9716 2162 2162 2163 2163 if ( empty($pages) ) { 2164 $page = apply_filters('get_pages', array(), $r);2164 $pages = apply_filters('get_pages', array(), $r); 2165 2165 return $pages; 2166 2166 } … … 3323 3323 */ 3324 3324 function wp_get_post_autosave( $post_id ) { 3325 global $wpdb; 3325 3326 3326 if ( !$post = get_post( $post_id ) ) 3327 3327 return false; -
trunk/wp-includes/theme.php
r9707 r9716 187 187 $author_uri = clean_url( trim( $author_uri[1]) ); 188 188 else 189 $author_u ti = '';189 $author_uri = ''; 190 190 191 191 if ( preg_match( '|Template:(.*)$|mi', $theme_data, $template ) ) -
trunk/wp-includes/user.php
r9344 r9716 260 260 261 261 if ( ! empty($meta_value) ) 262 $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user id, $meta_key, $meta_value) );262 $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s AND meta_value = %s", $user_id, $meta_key, $meta_value) ); 263 263 else 264 264 $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d AND meta_key = %s", $user_id, $meta_key) );
Note: See TracChangeset
for help on using the changeset viewer.