Changeset 12733
- Timestamp:
- 01/15/2010 10:11:12 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 59 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-activate.php
r12689 r12733 15 15 function wpmu_activate_stylesheet() { 16 16 ?> 17 <style type="text/css"> 17 <style type="text/css"> 18 18 form { margin-top: 2em; } 19 19 #submit, #key { width: 90%; font-size: 24px; } … … 31 31 <div id="content" class="widecolumn"> 32 32 <?php if ( empty($_GET['key']) && empty($_POST['key']) ) { ?> 33 33 34 34 <h2><?php _e('Activation Key Required') ?></h2> 35 35 <form name="activateform" id="activateform" method="post" action="<?php echo 'http://' . $current_site->domain . $current_site->path ?>wp-activate.php"> … … 42 42 </p> 43 43 </form> 44 44 45 45 <?php } else { 46 46 47 47 $key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key']; 48 $result = wpmu_activate_signup($key); 48 $result = wpmu_activate_signup($key); 49 49 if ( is_wp_error($result) ) { 50 50 if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) { … … 70 70 ?> 71 71 <h2><?php _e('Your account is now active!'); ?></h2> 72 72 73 73 <div id="signup-welcome"> 74 74 <p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p> 75 75 <p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $password; ?></p> 76 76 </div> 77 77 78 78 <?php if( $url != 'http://' . $current_site->domain . $current_site->path ) : ?> 79 79 <p class="view"><?php printf(__('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Login</a>'), $url, $url . 'wp-login.php' ); ?></p> … … 81 81 <p class="view"><?php printf( __( 'Your account is now activated. <a href="%1$s">Login</a> or go back to the <a href="%2$s">homepage</a>.' ), 'http://' . $current_site->domain . $current_site->path . 'wp-login.php', 'http://' . $current_site->domain . $current_site->path ); ?></p> 82 82 <?php endif; 83 } 83 } 84 84 } 85 85 ?> -
trunk/wp-admin/admin.php
r12731 r12733 33 33 } elseif ( apply_filters( 'do_mu_upgrade', true ) ) { 34 34 /** 35 * On really small MU installs run the upgrader every time, 35 * On really small MU installs run the upgrader every time, 36 36 * else run it less often to reduce load. 37 37 * -
trunk/wp-admin/categories.php
r12716 r12733 28 28 } else { 29 29 $parent_file = 'edit.php'; 30 $submenu_file = "categories.php?taxonomy=$taxonomy"; 30 $submenu_file = "categories.php?taxonomy=$taxonomy"; 31 31 } 32 32 -
trunk/wp-admin/css/wp-admin-rtl.css
r12721 r12733 10 10 } 11 11 .quicktags, .search { 12 font-family: Tahoma, Arial, sans-serif; 12 font-family: Tahoma, Arial, sans-serif; 13 13 } 14 14 /* 200 - 500 … … 52 52 .button-highlighted, 53 53 #postcustomstuff .submit input { 54 font-family: Tahoma, Arial, sans-serif; 54 font-family: Tahoma, Arial, sans-serif; 55 55 } 56 56 #wpcontent select { 57 font-family: Tahoma, Arial, sans-serif; 57 font-family: Tahoma, Arial, sans-serif; 58 58 } 59 59 #quicktags { … … 70 70 } 71 71 #your-profile legend { 72 font-family: Tahoma, Arial, sans-serif; 72 font-family: Tahoma, Arial, sans-serif; 73 73 } 74 74 #ajax-response.alignleft { … … 94 94 margin-right: 0; 95 95 margin-left: 10px; 96 font-family: Tahoma, Arial, sans-serif; 96 font-family: Tahoma, Arial, sans-serif; 97 97 } 98 98 #postcustomstuff table input, … … 116 116 } 117 117 #wphead h1 { 118 font-family: Tahoma, Arial, sans-serif; 118 font-family: Tahoma, Arial, sans-serif; 119 119 float: right; 120 120 } 121 121 #wphead h1.long-title { 122 font-family: Tahoma, Arial, sans-serif; 122 font-family: Tahoma, Arial, sans-serif; 123 123 } 124 124 #adminmenu .wp-submenu a { … … 127 127 border-width: 0 0 0 1px; 128 128 border-style: none none none solid; 129 font-family: Tahoma, Arial, sans-serif; 129 font-family: Tahoma, Arial, sans-serif; 130 130 } 131 131 #adminmenu a.menu-top, 132 132 #adminmenu .wp-submenu-head { 133 font-family: Tahoma, Arial, sans-serif; 133 font-family: Tahoma, Arial, sans-serif; 134 134 } 135 135 #adminmenu img.wp-menu-image { … … 178 178 #adminmenu span.update-plugins, 179 179 #sidemenu li a span.update-plugins { 180 font-family: Tahoma, Arial, sans-serif; 180 font-family: Tahoma, Arial, sans-serif; 181 181 margin-left: 0; 182 182 margin-right: 2px; … … 188 188 } 189 189 .post-com-count-wrapper { 190 font-family: Tahoma, Arial, sans-serif; 190 font-family: Tahoma, Arial, sans-serif; 191 191 } 192 192 .column-response .post-com-count { … … 250 250 } 251 251 .description, .form-wrap p { 252 font-family: Tahoma, Arial, sans-serif; 252 font-family: Tahoma, Arial, sans-serif; 253 253 } 254 254 /* 1500 - 1800 … … 258 258 } 259 259 .howto { 260 font-family: Tahoma, Arial, sans-serif; 260 font-family: Tahoma, Arial, sans-serif; 261 261 } 262 262 .postarea h3 label { … … 373 373 } 374 374 .tool-box .title { 375 font-family: Tahoma, Arial, sans-serif; 375 font-family: Tahoma, Arial, sans-serif; 376 376 } 377 377 .settings-toggle { … … 414 414 #contextual-help-link-wrap { 415 415 float: left; 416 font-family: Tahoma, Arial, sans-serif; 416 font-family: Tahoma, Arial, sans-serif; 417 417 margin: 0 0 0 6px; 418 418 } … … 477 477 .inline-edit-row .cathide, 478 478 .inline-edit-row #bulk-titles div { 479 font-family: Tahoma, Arial, sans-serif; 479 font-family: Tahoma, Arial, sans-serif; 480 480 } 481 481 .quick-edit-row-post fieldset label.inline-edit-status { -
trunk/wp-admin/edit-tags.php
r12712 r12733 28 28 } else { 29 29 $parent_file = 'edit.php'; 30 $submenu_file = "edit-tags.php?taxonomy=$taxonomy"; 30 $submenu_file = "edit-tags.php?taxonomy=$taxonomy"; 31 31 } 32 32 -
trunk/wp-admin/includes/class-wp-filesystem-ftpext.php
r12723 r12733 112 112 return explode("\n", $this->get_contents($file)); 113 113 } 114 114 115 115 function put_contents($file, $contents, $mode = false ) { 116 116 $temp = tmpfile(); -
trunk/wp-admin/includes/comment.php
r12715 r12733 126 126 return absint($pending[0]['num_comments']); 127 127 } 128 128 129 129 $pending_keyed = array(); 130 130 131 131 // Default to zero pending for all posts in request 132 132 foreach ( $post_id_array as $id ) -
trunk/wp-admin/includes/dashboard.php
r12459 r12733 637 637 if ( !$rss->get_item_quantity() ) { 638 638 echo '<p>' . __('This dashboard widget queries <a href="http://blogsearch.google.com/">Google Blog Search</a> so that when another blog links to your site it will show up here. It has found no incoming links… yet. It’s okay — there is no rush.') . "</p>\n"; 639 $rss->__destruct(); 639 $rss->__destruct(); 640 640 unset($rss); 641 641 return; … … 692 692 693 693 echo "</ul>\n"; 694 $rss->__destruct(); 694 $rss->__destruct(); 695 695 unset($rss); 696 696 } … … 749 749 } 750 750 } elseif ( !$rss->get_item_quantity() ) { 751 $rss->__destruct(); 751 $rss->__destruct(); 752 752 unset($rss); 753 753 return false; … … 756 756 wp_widget_rss_output( $rss, $widgets['dashboard_secondary'] ); 757 757 echo '</div>'; 758 $rss->__destruct(); 758 $rss->__destruct(); 759 759 unset($rss); 760 760 } … … 840 840 echo "<h5><a href='$link'>$title</a></h5> <span>(<a href='$ilink' class='thickbox' title='$title'>" . __( 'Install' ) . "</a>)</span>\n"; 841 841 echo "<p>$description</p>\n"; 842 842 843 843 $$feed->__destruct(); 844 844 unset($$feed); … … 939 939 $widget_options[$widget_id]['title'] = htmlentities(__('Unknown Feed')); 940 940 } else { 941 $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title())); 941 $widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title())); 942 942 $rss->__destruct(); 943 unset($rss); 943 unset($rss); 944 944 } 945 945 } -
trunk/wp-admin/includes/file.php
r12723 r12733 156 156 if ( function_exists('sys_get_temp_dir') ) 157 157 return trailingslashit(sys_get_temp_dir()); 158 158 159 159 $temp = ini_get('upload_tmp_dir'); 160 160 if ( is_dir($temp) ) // always writable -
trunk/wp-admin/includes/image-edit.php
r12555 r12733 40 40 <div onclick="imageEdit.crop(<?php echo "$post_id, '$nonce'"; ?>, this)" class="imgedit-crop disabled" title="<?php esc_attr_e( 'Crop' ); ?>"></div><?php 41 41 42 // On some setups GD library does not provide imagerotate() - Ticket #11536 42 // On some setups GD library does not provide imagerotate() - Ticket #11536 43 43 if ( function_exists('imagerotate') ) { ?> 44 44 <div class="imgedit-rleft" onclick="imageEdit.rotate( 90, <?php echo "$post_id, '$nonce'"; ?>, this)" title="<?php esc_attr_e( 'Rotate counter-clockwise' ); ?>"></div> … … 97 97 <a class="imgedit-help-toggle" onclick="imageEdit.toggleHelp(this);return false;" href="#"><strong><?php _e('Restore Original Image'); ?></strong></a> 98 98 <div class="imgedit-help"> 99 <p><?php _e('Discard any changes and restore the original image.'); 99 <p><?php _e('Discard any changes and restore the original image.'); 100 100 101 101 if ( !defined('IMAGE_EDIT_OVERWRITE') || !IMAGE_EDIT_OVERWRITE ) -
trunk/wp-admin/includes/media.php
r12582 r12733 1020 1020 $edit_post = sanitize_post($post, 'edit'); 1021 1021 1022 1022 1023 1023 1024 1024 $form_fields = array( … … 1224 1224 if ( !empty( $media_dims ) ) 1225 1225 $item .= "<p><strong>" . __('Dimensions:') . "</strong> $media_dims</p>\n"; 1226 1226 1227 1227 echo "</td></tr>\n"; 1228 1228 1229 1229 1230 1230 1231 1231 $item .= " … … 1249 1249 } elseif ( !MEDIA_TRASH ) { 1250 1250 $delete = "<a href='#' class='del-link' onclick=\"document.getElementById('del_attachment_$attachment_id').style.display='block';return false;\">" . __( 'Delete' ) . "</a> 1251 <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . " 1252 <a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a> 1251 <div id='del_attachment_$attachment_id' class='del-attachment' style='display:none;'>" . sprintf( __( 'You are about to delete <strong>%s</strong>.' ), $filename ) . " 1252 <a href='" . wp_nonce_url( "post.php?action=delete&post=$attachment_id", 'delete-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='button'>" . __( 'Continue' ) . "</a> 1253 1253 <a href='#' class='button' onclick=\"this.parentNode.style.display='none';return false;\">" . __( 'Cancel' ) . "</a> 1254 1254 </div>"; 1255 1255 } else { 1256 $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a> 1256 $delete = "<a href='" . wp_nonce_url( "post.php?action=trash&post=$attachment_id", 'trash-post_' . $attachment_id ) . "' id='del[$attachment_id]' class='delete'>" . __( 'Move to Trash' ) . "</a> 1257 1257 <a href='" . wp_nonce_url( "post.php?action=untrash&post=$attachment_id", 'untrash-post_' . $attachment_id ) . "' id='undo[$attachment_id]' class='undo hidden'>" . __( 'Undo' ) . "</a>"; 1258 1258 } -
trunk/wp-admin/includes/misc.php
r12728 r12733 232 232 /** 233 233 * Resets global variables based on $_GET and $_POST 234 * 234 * 235 235 * This function resets global variables based on the names passed 236 236 * in the $vars array to the value of $_POST[$var] or $_GET[$var] or '' -
trunk/wp-admin/includes/plugin.php
r12673 r12733 68 68 function get_plugin_data( $plugin_file, $markup = true, $translate = true ) { 69 69 70 $default_headers = array( 71 'Name' => 'Plugin Name', 72 'PluginURI' => 'Plugin URI', 73 'Version' => 'Version', 74 'Description' => 'Description', 75 'Author' => 'Author', 76 'AuthorURI' => 'Author URI', 77 'TextDomain' => 'Text Domain', 78 'DomainPath' => 'Domain Path' 70 $default_headers = array( 71 'Name' => 'Plugin Name', 72 'PluginURI' => 'Plugin URI', 73 'Version' => 'Version', 74 'Description' => 'Description', 75 'Author' => 'Author', 76 'AuthorURI' => 'Author URI', 77 'TextDomain' => 'Text Domain', 78 'DomainPath' => 'Domain Path' 79 79 ); 80 80 -
trunk/wp-admin/includes/post.php
r12728 r12733 959 959 * @since unknown 960 960 * 961 * @param int|object $id Post ID or post object. 962 * @param string $title (optional) Title 963 * @param string $name (optional) Name 964 * @return array With two entries of type string 961 * @param int|object $id Post ID or post object. 962 * @param string $title (optional) Title 963 * @param string $name (optional) Name 964 * @return array With two entries of type string 965 965 */ 966 966 function get_sample_permalink($id, $title = null, $name = null) { … … 1016 1016 * 1017 1017 * intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor. 1018 * 1019 * @since unknown 1020 * 1021 * @param int|object $id Post ID or post object. 1022 * @param string $new_title (optional) New title 1023 * @param string $new_slug (optional) New slug 1024 * @return string intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor. 1018 * 1019 * @since unknown 1020 * 1021 * @param int|object $id Post ID or post object. 1022 * @param string $new_title (optional) New title 1023 * @param string $new_slug (optional) New slug 1024 * @return string intended to be used for the inplace editor of the permalink post slug on in the post (and page?) editor. 1025 1025 */ 1026 1026 function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { … … 1186 1186 * @uses _wp_translate_postdata() 1187 1187 * @uses _wp_post_revision_fields() 1188 * 1188 * 1189 1189 * @return unknown 1190 1190 */ -
trunk/wp-admin/includes/schema.php
r12411 r12733 352 352 foreach ($unusedoptions as $option) 353 353 delete_option($option); 354 354 355 355 // delete obsolete magpie stuff 356 356 $wpdb->query("DELETE FROM $wpdb->options WHERE option_name REGEXP '^rss_[0-9a-f]{32}(_ts)?$'"); -
trunk/wp-admin/includes/theme.php
r12673 r12733 157 157 /** 158 158 * Tidies a filename for url display by the theme editor. 159 * 159 * 160 160 * @since 2.9.0 161 161 * @private 162 * 162 * 163 163 * @param string $fullpath Full path to the theme file 164 164 * @param string $containingfolder Path of the theme parent folder -
trunk/wp-admin/includes/widgets.php
r12360 r12733 69 69 if ( !empty( $description ) ) { 70 70 echo "<div class='sidebar-description'>\n"; 71 echo "\t<p class='description'>$description</p>"; 71 echo "\t<p class='description'>$description</p>"; 72 72 echo "</div>\n"; 73 73 } -
trunk/wp-admin/js/widgets.dev.js
r11870 r12733 30 30 $('a.widget-action').live('click', function(){ 31 31 var css = {}, widget = $(this).closest('div.widget'), inside = widget.children('.widget-inside'), w = parseInt( widget.find('input.widget-width').val(), 10 ); 32 32 33 33 if ( inside.is(':hidden') ) { 34 34 if ( w > 250 && inside.closest('div.widgets-sortables').length ) { -
trunk/wp-admin/js/wp-gears.dev.js
r11719 r12733 33 33 if ( host.match(/[^a-z0-9._-]/i) ) 34 34 host = encodeURIComponent(host); 35 35 36 36 name = window.location.protocol + host; 37 37 name = name.replace(/[^a-z0-9._-]+/gi, '_'); -
trunk/wp-admin/menu-header.php
r12712 r12733 19 19 20 20 global $menu, $submenu, $parent_file; //For when admin-header is included from within a function. 21 $parent_file = apply_filters("parent_file", $parent_file); // For plugins to move submenu tabs around. 21 $parent_file = apply_filters("parent_file", $parent_file); // For plugins to move submenu tabs around. 22 22 23 23 get_admin_page_parent(); -
trunk/wp-admin/menu.php
r12728 r12733 138 138 elseif ( is_super_admin() || get_site_option( 'add_new_users' ) ) 139 139 $submenu['users.php'][10] = array(__('Add New') . ' <strong>*</strong>', 'create_users', 'ms-options.php#addnewusers'); 140 140 141 141 $submenu['users.php'][15] = array(__('Your Profile'), 'read', 'profile.php'); 142 142 } else { -
trunk/wp-admin/ms-sites.php
r12725 r12733 310 310 // List blogs 311 311 default: 312 $apage = ( isset($_GET['apage'] ) && intval( $_GET['apage'] ) ) ? absint( $_GET['apage'] ) : 1; 313 $num = ( isset($_GET['num'] ) && intval( $_GET['num'] ) ) ? absint( $_GET['num'] ) : 15; 312 $apage = ( isset($_GET['apage'] ) && intval( $_GET['apage'] ) ) ? absint( $_GET['apage'] ) : 1; 313 $num = ( isset($_GET['num'] ) && intval( $_GET['num'] ) ) ? absint( $_GET['num'] ) : 15; 314 314 $s = wp_specialchars( trim( $_GET[ 's' ] ) ); 315 315 $like_s = like_escape($s); 316 316 317 317 $query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' "; 318 318 -
trunk/wp-admin/options-general.php
r12728 r12733 301 301 if( is_array($lang_files) && !empty($lang_files) ) { 302 302 ?> 303 <tr valign="top"> 304 <th width="33%" scope="row"><?php _e('Blog language:') ?></th> 303 <tr valign="top"> 304 <th width="33%" scope="row"><?php _e('Blog language:') ?></th> 305 305 <td> 306 306 <select name="WPLANG" id="WPLANG"> … … 308 308 </select> 309 309 </td> 310 </tr> 310 </tr> 311 311 <?php 312 312 } // languages -
trunk/wp-admin/options-permalink.php
r12718 r12733 237 237 <?php if ( !is_multisite || is_super_admin() ) { ?> 238 238 <?php if ($iis7_permalinks) : 239 if ( isset($_POST['submit']) && $permalink_structure && ! $usingpi && ! $writable ) : 239 if ( isset($_POST['submit']) && $permalink_structure && ! $usingpi && ! $writable ) : 240 240 if ( file_exists($home_path . 'web.config') ) : ?> 241 241 <p><?php _e('If your <code>web.config</code> file were <a href="http://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your <code>web.config</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this rule inside of the <code>/<configuration>/<system.webServer>/<rewrite>/<rules></code> element in <code>web.config</code> file.') ?></p> … … 251 251 <p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_html($wp_rewrite->iis7_url_rewrite_rules(true)); ?></textarea></p> 252 252 </form> 253 <p><?php _e('If you temporarily make your site’s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p> 253 <p><?php _e('If you temporarily make your site’s root directory writable for us to generate the <code>web.config</code> file automatically, do not forget to revert the permissions after the file has been created.') ?></p> 254 254 <?php endif; ?> 255 255 <?php endif; ?> -
trunk/wp-admin/options.php
r12712 r12733 70 70 if ( 'options' == $option_page ) { 71 71 $options = explode(',', stripslashes( $_POST[ 'page_options' ] )); 72 if ( !is_super_admin() ) 72 if ( !is_super_admin() ) 73 73 wp_die( __( 'Not allowed here' ) ); 74 74 } else { -
trunk/wp-admin/press-this.php
r12592 r12733 29 29 $quick['tax_input'] = isset($_POST['tax_input']) ? $_POST['tax_input'] : null; 30 30 $quick['post_title'] = ( trim($_POST['title']) != '' ) ? $_POST['title'] : ' '; 31 $quick['post_content'] = isset($_POST['post_content']) ? $_POST['post_content'] : ''; 31 $quick['post_content'] = isset($_POST['post_content']) ? $_POST['post_content'] : ''; 32 32 33 33 // insert the post with nothing in it, to get an ID … … 401 401 } 402 402 jQuery('#extra-fields').before('<div id="waiting"><img src="images/wpspin_light.gif" alt="" /> <?php echo esc_js( __( 'Loading...' ) ); ?></div>'); 403 403 404 404 if(photostorage == false) { 405 405 jQuery.ajax({ -
trunk/wp-admin/theme-editor.php
r12569 r12733 38 38 $file = stripslashes($file); 39 39 if ( 'theme' == $dir ) { 40 $file = dirname(dirname($themes[$theme]['Template Dir'])) . $file ; 40 $file = dirname(dirname($themes[$theme]['Template Dir'])) . $file ; 41 41 } else if ( 'style' == $dir) { 42 $file = dirname(dirname($themes[$theme]['Stylesheet Dir'])) . $file ; 42 $file = dirname(dirname($themes[$theme]['Stylesheet Dir'])) . $file ; 43 43 } 44 44 } -
trunk/wp-admin/themes.php
r12728 r12733 16 16 $themes = get_themes(); 17 17 $ct = current_theme_info(); 18 $allowed_themes = apply_filters("allowed_themes", get_site_allowed_themes() ); 18 $allowed_themes = apply_filters("allowed_themes", get_site_allowed_themes() ); 19 19 if( $allowed_themes == false ) 20 20 $allowed_themes = array(); -
trunk/wp-admin/user-edit.php
r12722 r12733 62 62 63 63 64 // Only allow site admins to edit every user. 65 if ( is_multisite() && !defined( "EDIT_ANY_USER" ) && !is_super_admin() && $user_id != $current_user->ID ) 66 wp_die( __( 'You do not have permission to edit this user.' ) ); 67 64 // Only allow site admins to edit every user. 65 if ( is_multisite() && !defined( "EDIT_ANY_USER" ) && !is_super_admin() && $user_id != $current_user->ID ) 66 wp_die( __( 'You do not have permission to edit this user.' ) ); 67 68 68 switch ($action) { 69 69 case 'switchposts': -
trunk/wp-config-sample.php
r12674 r12733 1 1 <?php 2 /** 2 /** 3 3 * The base configurations of the WordPress. 4 4 * -
trunk/wp-includes/capabilities.php
r12699 r12733 125 125 * The capabilities are defined in the following format `array( 'read' => true );` 126 126 * To explicitly deny a role a capability you set the value for that capability to false. 127 * 127 * 128 128 * @since 2.0.0 129 129 * @access public … … 717 717 $cap = $this->translate_level_to_cap( $cap ); 718 718 } 719 719 720 720 $args = array_slice( func_get_args(), 1 ); 721 721 $args = array_merge( array( $cap, $this->ID ), $args ); -
trunk/wp-includes/comment.php
r12680 r12733 190 190 'ID' => '', 191 191 'karma' => '', 192 'number' => '', 193 'offset' => '', 194 'orderby' => '', 195 'order' => 'DESC', 192 'number' => '', 193 'offset' => '', 194 'orderby' => '', 195 'order' => 'DESC', 196 196 'parent' => '', 197 197 'post_ID' => '', 198 198 'post_id' => 0, 199 'status' => '', 199 'status' => '', 200 200 'type' => '', 201 201 'user_id' => '', … … 236 236 $ordersby = is_array($orderby) ? $orderby : preg_split('/[,\s]/', $orderby); 237 237 $ordersby = array_intersect( 238 $ordersby, 238 $ordersby, 239 239 array( 240 240 'comment_agent', … … 277 277 if ( ! empty($post_id) ) 278 278 $post_where .= $wpdb->prepare( 'comment_post_ID = %d AND ', $post_id ); 279 if ( '' !== $author_email ) 279 if ( '' !== $author_email ) 280 280 $post_where .= $wpdb->prepare( 'comment_author_email = %s AND ', $author_email ); 281 281 if ( '' !== $karma ) … … 283 283 if ( 'comment' == $type ) 284 284 $post_where .= "comment_type = '' AND "; 285 elseif ( ! empty( $type ) ) 285 elseif ( ! empty( $type ) ) 286 286 $post_where .= $wpdb->prepare( 'comment_type = %s AND ', $type ); 287 287 if ( '' !== $parent ) -
trunk/wp-includes/default-constants.php
r12732 r12733 27 27 } 28 28 } 29 29 30 30 /** 31 31 * The $blog_id global, which you can change in the config allows you to create a simple … … 37 37 if ( ! isset($blog_id) ) 38 38 $blog_id = 1; 39 39 40 40 // set memory limits. 41 41 if ( function_exists('memory_get_usage') && ( (int) @ini_get('memory_limit') < abs(intval(WP_MEMORY_LIMIT)) ) ) 42 42 @ini_set('memory_limit', WP_MEMORY_LIMIT); 43 43 44 44 if ( !defined('WP_CONTENT_DIR') ) 45 45 define( 'WP_CONTENT_DIR', ABSPATH . 'wp-content' ); // no trailing slash, full paths only - WP_CONTENT_URL is defined further down 46 46 47 47 // Add define('WP_DEBUG', true); to wp-config.php to enable display of notices during development. 48 48 if ( !defined('WP_DEBUG') ) 49 49 define( 'WP_DEBUG', false ); 50 50 51 51 // Add define('WP_DEBUG_DISPLAY', false); to wp-config.php to use the globally configured setting for display_errors and not force it to On 52 52 if ( !defined('WP_DEBUG_DISPLAY') ) 53 53 define( 'WP_DEBUG_DISPLAY', true ); 54 54 55 55 // Add define('WP_DEBUG_LOG', true); to enable php debug logging to WP_CONTENT_DIR/debug.log 56 56 if ( !defined('WP_DEBUG_LOG') ) 57 57 define('WP_DEBUG_LOG', false); 58 58 59 59 if ( !defined('WP_CACHE') ) 60 60 define('WP_CACHE', false); 61 61 62 62 /** 63 63 * Private … … 65 65 if ( !defined('MEDIA_TRASH') ) 66 66 define('MEDIA_TRASH', false); 67 67 68 68 if ( !defined('SHORTINIT') ) 69 69 define('SHORTINIT', false); … … 74 74 if ( !defined('WP_CONTENT_URL') ) 75 75 define( 'WP_CONTENT_URL', get_option('siteurl') . '/wp-content'); // full url - WP_CONTENT_DIR is defined further up 76 76 77 77 /** 78 78 * Allows for the plugins directory to be moved from the default location. … … 82 82 if ( !defined('WP_PLUGIN_DIR') ) 83 83 define( 'WP_PLUGIN_DIR', WP_CONTENT_DIR . '/plugins' ); // full path, no trailing slash 84 84 85 85 /** 86 86 * Allows for the plugins directory to be moved from the default location. … … 90 90 if ( !defined('WP_PLUGIN_URL') ) 91 91 define( 'WP_PLUGIN_URL', WP_CONTENT_URL . '/plugins' ); // full url, no trailing slash 92 92 93 93 /** 94 94 * Allows for the plugins directory to be moved from the default location. … … 109 109 if ( !defined('WPMU_PLUGIN_DIR') ) 110 110 define( 'WPMU_PLUGIN_DIR', WP_CONTENT_DIR . '/mu-plugins' ); // full path, no trailing slash 111 111 112 112 /** 113 113 * Allows for the mu-plugins directory to be moved from the default location. … … 117 117 if ( !defined('WPMU_PLUGIN_URL') ) 118 118 define( 'WPMU_PLUGIN_URL', WP_CONTENT_URL . '/mu-plugins' ); // full url, no trailing slash 119 119 120 120 /** 121 121 * Allows for the mu-plugins directory to be moved from the default location. … … 130 130 131 131 global $wp_default_secret_key; 132 132 133 133 /** 134 134 * Used to guarantee unique hash cookies … … 137 137 if( !defined('COOKIEHASH') ) 138 138 define('COOKIEHASH', md5(get_option('siteurl'))); 139 139 140 140 /** 141 141 * Should be exactly the same as the default value of SECRET_KEY in wp-config-sample.php … … 143 143 */ 144 144 $wp_default_secret_key = 'put your unique phrase here'; 145 145 146 146 /** 147 147 * It is possible to define this in wp-config.php … … 150 150 if ( !defined('USER_COOKIE') ) 151 151 define('USER_COOKIE', 'wordpressuser_' . COOKIEHASH); 152 152 153 153 /** 154 154 * It is possible to define this in wp-config.php … … 157 157 if ( !defined('PASS_COOKIE') ) 158 158 define('PASS_COOKIE', 'wordpresspass_' . COOKIEHASH); 159 159 160 160 /** 161 161 * It is possible to define this in wp-config.php … … 164 164 if ( !defined('AUTH_COOKIE') ) 165 165 define('AUTH_COOKIE', 'wordpress_' . COOKIEHASH); 166 166 167 167 /** 168 168 * It is possible to define this in wp-config.php … … 171 171 if ( !defined('SECURE_AUTH_COOKIE') ) 172 172 define('SECURE_AUTH_COOKIE', 'wordpress_sec_' . COOKIEHASH); 173 173 174 174 /** 175 175 * It is possible to define this in wp-config.php … … 178 178 if ( !defined('LOGGED_IN_COOKIE') ) 179 179 define('LOGGED_IN_COOKIE', 'wordpress_logged_in_' . COOKIEHASH); 180 180 181 181 /** 182 182 * It is possible to define this in wp-config.php … … 185 185 if ( !defined('TEST_COOKIE') ) 186 186 define('TEST_COOKIE', 'wordpress_test_cookie'); 187 187 188 188 /** 189 189 * It is possible to define this in wp-config.php … … 192 192 if ( !defined('COOKIEPATH') ) 193 193 define('COOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('home') . '/' ) ); 194 194 195 195 /** 196 196 * It is possible to define this in wp-config.php … … 199 199 if ( !defined('SITECOOKIEPATH') ) 200 200 define('SITECOOKIEPATH', preg_replace('|https?://[^/]+|i', '', get_option('siteurl') . '/' ) ); 201 201 202 202 /** 203 203 * It is possible to define this in wp-config.php … … 206 206 if ( !defined('ADMIN_COOKIE_PATH') ) 207 207 define( 'ADMIN_COOKIE_PATH', SITECOOKIEPATH . 'wp-admin' ); 208 208 209 209 /** 210 210 * It is possible to define this in wp-config.php … … 213 213 if ( !defined('PLUGINS_COOKIE_PATH') ) 214 214 define( 'PLUGINS_COOKIE_PATH', preg_replace('|https?://[^/]+|i', '', WP_PLUGIN_URL) ); 215 215 216 216 /** 217 217 * It is possible to define this in wp-config.php … … 220 220 if ( !defined('COOKIE_DOMAIN') ) 221 221 define('COOKIE_DOMAIN', false); 222 222 223 223 /** 224 224 * It is possible to define this in wp-config.php … … 228 228 define('FORCE_SSL_ADMIN', false); 229 229 force_ssl_admin(FORCE_SSL_ADMIN); 230 230 231 231 /** 232 232 * It is possible to define this in wp-config.php … … 236 236 define('FORCE_SSL_LOGIN', false); 237 237 force_ssl_login(FORCE_SSL_LOGIN); 238 238 239 239 /** 240 240 * It is possible to define this in wp-config.php … … 243 243 if ( !defined( 'AUTOSAVE_INTERVAL' ) ) 244 244 define( 'AUTOSAVE_INTERVAL', 60 ); 245 245 246 246 /** 247 247 * It is possible to define this in wp-config.php … … 265 265 */ 266 266 define('TEMPLATEPATH', get_template_directory()); 267 267 268 268 /** 269 269 * Web Path to the current active template stylesheet directory -
trunk/wp-includes/default-widgets.php
r12598 r12733 791 791 if ( !$rss->get_item_quantity() ) { 792 792 echo '<ul><li>' . __( 'An error has occurred; the feed is probably down. Try again later.' ) . '</li></ul>'; 793 $rss->__destruct(); 793 $rss->__destruct(); 794 794 unset($rss); 795 795 return; … … 844 844 } 845 845 echo '</ul>'; 846 $rss->__destruct(); 846 $rss->__destruct(); 847 847 unset($rss); 848 848 } -
trunk/wp-includes/deprecated.php
r12657 r12733 508 508 'title_li' => '', 509 509 ); 510 510 511 511 $r = wp_parse_args( $args, $defaults ); 512 512 … … 974 974 975 975 $defaults = array( 976 'after' => '<br />', 976 'after' => '<br />', 977 977 'before' => '', 978 978 'between' => ' ', 979 979 'categorize' => 0, 980 'category' => '', 980 'category' => '', 981 981 'echo' => true, 982 'limit' => -1, 982 'limit' => -1, 983 983 'orderby' => 'name', 984 'show_description' => true, 985 'show_images' => true, 984 'show_description' => true, 985 'show_images' => true, 986 986 'show_rating' => false, 987 987 'show_updated' => true, … … 990 990 991 991 $r = wp_parse_args( $args, $defaults ); 992 992 993 993 return wp_list_bookmarks($r); 994 994 } -
trunk/wp-includes/formatting.php
r12680 r12733 34 34 $textarr = preg_split('/(<.*>|\[.*\])/Us', $text, -1, PREG_SPLIT_DELIM_CAPTURE); 35 35 $stop = count($textarr); 36 36 37 37 // No need to setup these variables more than once 38 38 if (!$static_setup) { … … 75 75 76 76 if ( !empty($curl) && '<' != $curl{0} && '[' != $curl{0} 77 && empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack)) { 77 && empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack)) { 78 78 // This is not a tag, nor is the texturization disabled 79 79 // static strings … … 121 121 * This disables texturize until we find a closing tag of our type 122 122 * (e.g. <pre>) even if there was invalid nesting before that 123 * 123 * 124 124 * Example: in the case <pre>sadsadasd</code>"baba"</pre> 125 125 * "baba" won't be texturize … … 691 691 foreach ( (array) $parts as $part) { 692 692 $filename .= '.' . $part; 693 693 694 694 if ( preg_match("/^[a-zA-Z]{2,5}\d?$/", $part) ) { 695 695 $allowed = false; … … 2414 2414 */ 2415 2415 function like_escape($text) { 2416 return addcslashes($text, '\\%_'); 2416 return addcslashes($text, '\\%_'); 2417 2417 } 2418 2418 -
trunk/wp-includes/functions.php
r12727 r12733 577 577 do_action( "add_option_{$name}", $name, $value ); 578 578 do_action( 'added_option', $name, $value ); 579 579 580 580 return; 581 581 } … … 2308 2308 'mid|midi' => 'audio/midi', 2309 2309 'wma' => 'audio/wma', 2310 'mka' => 'audio/x-matroska', 2311 'mkv' => 'video/x-matroska', 2310 'mka' => 'audio/x-matroska', 2311 'mkv' => 'video/x-matroska', 2312 2312 'rtf' => 'application/rtf', 2313 2313 'js' => 'application/javascript', … … 3393 3393 * If the transient does not exist or does not have a value, then the return value 3394 3394 * will be false. 3395 * 3395 * 3396 3396 * @since 2.9.0 3397 3397 * @package WordPress … … 3679 3679 $selected = 'selected="selected" '; 3680 3680 $structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>"; 3681 3681 3682 3682 } 3683 3683 $structure[] = '</optgroup>'; … … 3746 3746 * Parse the file contents to retrieve its metadata. 3747 3747 * 3748 * Searches for metadata for a file, such as a plugin or theme. Each piece of 3748 * Searches for metadata for a file, such as a plugin or theme. Each piece of 3749 3749 * metadata must be on its own line. For a field spanning multple lines, it 3750 3750 * must not have any newlines or only parts of it will be displayed. … … 3766 3766 * @param string $file Path to the file 3767 3767 * @param bool $markup If the returned data should have HTML markup applied 3768 * @param string $context If specified adds filter hook "extra_<$context>_headers" 3768 * @param string $context If specified adds filter hook "extra_<$context>_headers" 3769 3769 */ 3770 3770 function get_file_data( $file, $default_headers, $context = '' ) { … … 3790 3790 } 3791 3791 3792 3792 3793 3793 foreach ( $all_headers as $field => $regex ) { 3794 3794 preg_match( '/' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, ${$field}); … … 3800 3800 3801 3801 $file_data = compact( array_keys( $all_headers ) ); 3802 3802 3803 3803 return $file_data; 3804 3804 } 3805 3805 /* 3806 3806 * Used internally to tidy up the search terms 3807 * 3807 * 3808 3808 * @private 3809 3809 * @since 2.9.0 -
trunk/wp-includes/general-template.php
r12701 r12733 211 211 'label_username' => __( 'Username' ), 212 212 'label_password' => __( 'Password' ), 213 'label_remember' => __( 'Remember Me' ), 214 'label_log_in' => __( 'Log In' ), 215 'id_username' => 'user_login', 216 'id_password' => 'user_pass', 217 'id_remember' => 'rememberme', 218 'id_submit' => 'wp-submit', 219 'remember' => true, 213 'label_remember' => __( 'Remember Me' ), 214 'label_log_in' => __( 'Log In' ), 215 'id_username' => 'user_login', 216 'id_password' => 'user_pass', 217 'id_remember' => 'rememberme', 218 'id_submit' => 'wp-submit', 219 'remember' => true, 220 220 'value_username' => '', 221 221 'value_remember' => false, // Set this to true to default the "Remember me" checkbox to checked 222 222 ); 223 223 $args = wp_parse_args( $args, apply_filters( 'login_form_defaults', $defaults ) ); 224 224 225 225 $form = ' 226 226 <form name="' . $args['form_id'] . '" id="' . $args['form_id'] . '" action="' . site_url( 'wp-login.php', 'login' ) . '" method="post"> … … 242 242 ' . do_action( 'login_form_bottom' ) . ' 243 243 </form>'; 244 244 245 245 if ( $args['echo'] ) 246 246 echo $form; … … 1302 1302 */ 1303 1303 function the_modified_date($d = '', $before='', $after='', $echo = true) { 1304 1304 1305 1305 $the_modified_date = $before . get_the_modified_date($d) . $after; 1306 1306 $the_modified_date = apply_filters('the_modified_date', $the_modified_date, $d, $before, $after); 1307 1307 1308 1308 if ( $echo ) 1309 1309 echo $the_modified_date; 1310 1310 else 1311 1311 return $the_modified_date; 1312 1312 1313 1313 } 1314 1314 -
trunk/wp-includes/js/autosave.dev.js
r12022 r12733 3 3 jQuery(document).ready( function($) { 4 4 var dotabkey = true; 5 5 6 6 autosaveLast = $('#post #title').val() + $('#post #content').val(); 7 7 autosavePeriodical = $.schedule({time: autosaveL10n.autosaveInterval * 1000, func: function() { autosave(); }, repeat: true, protect: true}); -
trunk/wp-includes/js/quicktags.dev.js
r10745 r12733 334 334 function edInsertContent(myField, myValue) { 335 335 var sel, startPos, endPos, scrollTop; 336 336 337 337 //IE support 338 338 if (document.selection) { -
trunk/wp-includes/js/wp-list-revisions.dev.js
r12502 r12733 8 8 checkCount += inputs[i].checked ? 1 : 0; 9 9 side = inputs[i].getAttribute('name'); 10 if ( ! inputs[i].checked && 10 if ( ! inputs[i].checked && 11 11 ( 'left' == side && 1 > checkCount || 'right' == side && 1 < checkCount && ( ! inputs[i-1] || ! inputs[i-1].checked ) ) && 12 12 ! ( inputs[i+1] && inputs[i+1].checked && 'right' == inputs[i+1].getAttribute('name') ) ) 13 inputs[i].style.visibility = 'hidden'; 13 inputs[i].style.visibility = 'hidden'; 14 14 else if ( 'left' == side || 'right' == side ) 15 15 inputs[i].style.visibility = 'visible'; … … 18 18 pr.onclick(); 19 19 } 20 if ( w && w.addEventListener ) 20 if ( w && w.addEventListener ) 21 21 w.addEventListener('load', init, false); 22 22 else if ( w && w.attachEvent ) -
trunk/wp-includes/l10n.php
r12594 r12733 314 314 function load_textdomain( $domain, $mofile ) { 315 315 global $l10n; 316 316 317 317 $plugin_override = apply_filters( 'override_load_textdomain', false, $domain, $mofile ); 318 318 319 319 if ( true == $plugin_override ) { 320 320 return true; 321 321 } 322 322 323 323 do_action( 'load_textdomain', $domain, $mofile ); 324 324 325 325 $mofile = apply_filters( 'load_textdomain_mofile', $mofile, $domain ); 326 326 … … 334 334 335 335 $l10n[$domain] = &$mo; 336 336 337 337 return true; 338 338 } … … 378 378 $path = WP_PLUGIN_DIR; 379 379 } 380 380 381 381 $mofile = $path . '/'. $domain . '-' . $locale . '.mo'; 382 382 return load_textdomain( $domain, $mofile ); -
trunk/wp-includes/link-template.php
r12680 r12733 683 683 $action = '&action=edit'; 684 684 685 $post_type_object = get_post_type_object( $post->post_type ); 685 $post_type_object = get_post_type_object( $post->post_type ); 686 686 if ( !$post_type_object ) 687 687 return; … … 1099 1099 if ( empty($posts) ) 1100 1100 return; 1101 1101 1102 1102 // Even though we limited get_posts to return only 1 item it still returns an array of objects. 1103 1103 $post = $posts[0]; -
trunk/wp-includes/media.php
r12659 r12733 746 746 $columns = intval($columns); 747 747 $itemwidth = $columns > 0 ? floor(100/$columns) : 100; 748 $float = $wp_locale->text_direction == 'rtl' ? 'right' : 'left'; 749 748 $float = $wp_locale->text_direction == 'rtl' ? 'right' : 'left'; 749 750 750 $selector = "gallery-{$instance}"; 751 751 -
trunk/wp-includes/ms-deprecated.php
r12645 r12733 12 12 * Deprecated functions come here to die. 13 13 */ 14 14 15 15 /** 16 16 * @since unknown -
trunk/wp-includes/ms-functions.php
r12730 r12733 1374 1374 if ( $wpdb->get_results("SELECT ID FROM $wpdb->posts") ) 1375 1375 die(__('<h1>Already Installed</h1><p>You appear to have already installed WordPress. To reinstall please clear your old database tables first.</p>') . '</body></html>'); 1376 1376 1377 1377 $wpdb->suppress_errors(false); 1378 1378 … … 1403 1403 1404 1404 $blogroll_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM {$wpdb->sitecategories} WHERE category_nicename = %s", $cat_slug ) ); 1405 1405 1406 1406 if ( $blogroll_id == null ) { 1407 1407 $wpdb->insert( $wpdb->sitecategories, array('cat_ID' => 0, 'cat_name' => $cat_name, 'category_nicename' => $cat_slug, 'last_updated' => current_time('mysql', true)) ); -
trunk/wp-includes/pluggable.php
r12653 r12733 977 977 978 978 $comment_author_domain = @gethostbyaddr($comment->comment_author_IP); 979 979 980 980 // The blogname option is escaped with esc_html on the way into the database in sanitize_option 981 981 // we want to reverse this for the plain text arena of emails. … … 1073 1073 $comment_author_domain = @gethostbyaddr($comment->comment_author_IP); 1074 1074 $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'"); 1075 1075 1076 1076 // The blogname option is escaped with esc_html on the way into the database in sanitize_option 1077 1077 // we want to reverse this for the plain text arena of emails. 1078 1078 $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); 1079 1079 1080 1080 switch ($comment->comment_type) 1081 1081 { … … 1165 1165 $user_login = stripslashes($user->user_login); 1166 1166 $user_email = stripslashes($user->user_email); 1167 1167 1168 1168 // The blogname option is escaped with esc_html on the way into the database in sanitize_option 1169 1169 // we want to reverse this for the plain text arena of emails. -
trunk/wp-includes/plugin.php
r12641 r12733 302 302 if ( ! isset($wp_actions) ) 303 303 $wp_actions = array(); 304 304 305 305 if ( ! isset($wp_actions[$tag]) ) 306 306 $wp_actions[$tag] = 1; … … 388 388 if ( ! isset($wp_actions) ) 389 389 $wp_actions = array(); 390 390 391 391 if ( ! isset($wp_actions[$tag]) ) 392 392 $wp_actions[$tag] = 1; -
trunk/wp-includes/post-thumbnail-template.php
r12605 r12733 12 12 /** 13 13 * Check if post has an image attached. 14 * 14 * 15 15 * @since 2.9.0 16 16 * … … 26 26 /** 27 27 * Retrieve Post Thumbnail ID. 28 * 28 * 29 29 * @since 2.9.0 30 30 * … … 40 40 /** 41 41 * Display Post Thumbnail. 42 * 42 * 43 43 * @since 2.9.0 44 44 * … … 52 52 /** 53 53 * Retrieve Post Thumbnail. 54 * 54 * 55 55 * @since 2.9.0 56 56 * -
trunk/wp-includes/post.php
r12719 r12733 684 684 /** 685 685 * Register support of certain features for a post type. 686 * 686 * 687 687 * @since 3.0 688 688 * @param string $post_type The post type for which to add the feature … … 2152 2152 * Given the desired slug and some post details computes a unique slug for the post. 2153 2153 * 2154 * @global wpdb $wpdb 2155 * @global WP_Rewrite $wp_rewrite 2154 * @global wpdb $wpdb 2155 * @global WP_Rewrite $wp_rewrite 2156 2156 * @param string $slug the desired slug (post_name) 2157 2157 * @param integer $post_ID -
trunk/wp-includes/query.php
r12597 r12733 333 333 /** 334 334 * Whether current page view is the blog homepage. 335 * 335 * 336 336 * This is the page which is showing the time based blog content of your site 337 337 * so if you set a static page for the front page of your site then this will 338 * only be true on the page which you set as the "Posts page" in Reading Settings. 338 * only be true on the page which you set as the "Posts page" in Reading Settings. 339 339 * 340 340 * @since 1.5.0 … … 2066 2066 $post_type_object = get_post_type_object ( $post_type ); 2067 2067 if ( !empty($post_type_object) ) 2068 $post_type_cap = $post_type_object->capability_type; 2068 $post_type_cap = $post_type_object->capability_type; 2069 2069 else 2070 2070 $post_type_cap = $post_type; … … 2078 2078 $where .= $exclude_post_types; 2079 2079 } elseif ( !empty( $post_type ) && is_array( $post_type ) ) { 2080 $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')"; 2080 $where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')"; 2081 2081 } elseif ( ! empty( $post_type ) ) { 2082 2082 $where .= " AND $wpdb->posts.post_type = '$post_type'"; -
trunk/wp-includes/registration.php
r12468 r12733 119 119 $user_login = sanitize_user($user_login, true); 120 120 $user_login = apply_filters('pre_user_login', $user_login); 121 121 122 122 //Remove any non-printable chars from the login string to see if we have ended up with an empty username 123 123 $user_login = trim($user_login); 124 124 125 125 if ( empty($user_login) ) { 126 126 return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') ); 127 127 } 128 128 129 129 if ( empty($user_nicename) ) 130 130 $user_nicename = sanitize_title( $user_login ); -
trunk/wp-includes/rewrite.php
r12700 r12733 787 787 //get pages in order of hierarchy, i.e. children after parents 788 788 $posts = get_page_hierarchy($wpdb->get_results("SELECT ID, post_name, post_parent FROM $wpdb->posts WHERE post_type = 'page'")); 789 789 790 790 // If we have no pages get out quick 791 791 if ( !$posts ) … … 1736 1736 $extra_indent = $indent.$indent.$indent.$indent; 1737 1737 } 1738 1738 1739 1739 $rules .= $extra_indent."<rule name=\"wordpress\" patternSyntax=\"Wildcard\">".$end_of_line; 1740 1740 $rules .= $extra_indent.$indent."<match url=\"*\" />".$end_of_line; … … 1745 1745 $rules .= $extra_indent.$indent."<action type=\"Rewrite\" url=\"index.php\" />".$end_of_line; 1746 1746 $rules .= $extra_indent."</rule>"; 1747 1747 1748 1748 if ( $add_parent_tags ) { 1749 1749 $rules .= $end_of_line.$indent.$indent.$indent."</rules>".$end_of_line; -
trunk/wp-includes/script-loader.php
r12678 r12733 177 177 'l10n_print_after' => 'try{convertEntities(thickboxL10n);}catch(e){};' 178 178 ) ); 179 179 180 180 181 181 $scripts->add( 'jcrop', "/wp-includes/js/jcrop/jquery.Jcrop$suffix.js", array('jquery'), '0.9.8'); -
trunk/wp-includes/taxonomy.php
r12729 r12733 576 576 * 'exclude' is ignored. 577 577 * 578 * exclude_tree - Default is an empty array. An array, comma- or space-delimited 579 * string of term ids to exclude from the return array, along with all of their 580 * descendant terms according to the primary taxonomy. If 'include' is non-empty, 578 * exclude_tree - Default is an empty array. An array, comma- or space-delimited 579 * string of term ids to exclude from the return array, along with all of their 580 * descendant terms according to the primary taxonomy. If 'include' is non-empty, 581 581 * 'exclude_tree' is ignored. 582 582 * -
trunk/wp-includes/theme.php
r12598 r12733 171 171 */ 172 172 function get_theme_data( $theme_file ) { 173 $default_headers = array( 174 'Name' => 'Theme Name', 175 'URI' => 'Theme URI', 176 'Description' => 'Description', 177 'Author' => 'Author', 173 $default_headers = array( 174 'Name' => 'Theme Name', 175 'URI' => 'Theme URI', 176 'Description' => 'Description', 177 'Author' => 'Author', 178 178 'AuthorURI' => 'Author URI', 179 'Version' => 'Version', 180 'Template' => 'Template', 181 'Status' => 'Status', 179 'Version' => 'Version', 180 'Template' => 'Template', 181 'Status' => 'Status', 182 182 'Tags' => 'Tags' 183 183 ); … … 371 371 $template_files = array_unique($template_files); 372 372 $stylesheet_files = array_unique($stylesheet_files); 373 373 374 374 $template_dir = dirname($template_files[0]); 375 375 $stylesheet_dir = dirname($stylesheet_files[0]); … … 1314 1314 /** 1315 1315 * Allows a theme to register its support of a certain feature 1316 * 1316 * 1317 1317 * Must be called in the themes functions.php file to work. 1318 1318 * -
trunk/wp-includes/user.php
r12699 r12733 641 641 $vars = get_object_vars($user); 642 642 foreach ( array_keys($vars) as $field ) { 643 if ( is_string($user->$field) || is_numeric($user->$field) ) 643 if ( is_string($user->$field) || is_numeric($user->$field) ) 644 644 $user->$field = sanitize_user_field($field, $user->$field, $user->ID, $context); 645 645 } -
trunk/wp-includes/wp-db.php
r12668 r12733 806 806 if ( defined('SAVEQUERIES') && SAVEQUERIES ) 807 807 $this->timer_start(); 808 808 809 809 // use $this->dbh for read ops, and $this->dbhwrite for write ops 810 810 // use $this->dbhglobal for gloal table ops -
trunk/wp-signup.php
r12689 r12733 30 30 function wpmu_signup_stylesheet() { 31 31 ?> 32 <style type="text/css"> 32 <style type="text/css"> 33 33 .mu_register { width: 90%; margin:0 auto; } 34 34 .mu_register form { margin-top: 2em; } … … 36 36 .mu_register input[type="submit"], 37 37 .mu_register #blog_title, 38 .mu_register #user_email, 38 .mu_register #user_email, 39 39 .mu_register #blogname, 40 .mu_register #user_name { width:100%; font-size: 24px; margin:5px 0; } 40 .mu_register #user_name { width:100%; font-size: 24px; margin:5px 0; } 41 41 .mu_register .prefix_address, 42 .mu_register .suffix_address {font-size: 18px;display:inline; } 42 .mu_register .suffix_address {font-size: 18px;display:inline; } 43 43 .mu_register label { font-weight:700; font-size:15px; display:block; margin:10px 0; } 44 44 .mu_register label.checkbox { display:inline; } … … 83 83 // Blog Title 84 84 ?> 85 <label for="blog_title"><?php _e('Blog Title:') ?></label> 85 <label for="blog_title"><?php _e('Blog Title:') ?></label> 86 86 <?php if ( $errmsg = $errors->get_error_message('blog_title') ) { ?> 87 87 <p class="error"><?php echo $errmsg ?></p> … … 93 93 <p class="privacy-intro"> 94 94 <label for="blog_public_on"><?php _e('Privacy:') ?></label> 95 <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?> 95 <?php _e('I would like my blog to appear in search engines like Google and Technorati, and in public listings around this site.'); ?> 96 96 <div style="clear:both;"></div> 97 97 <label class="checkbox" for="blog_public_on"> … … 105 105 </p> 106 106 </div> 107 107 108 108 <?php 109 109 do_action('signup_blogform', $errors); … … 131 131 <?php if ( $errmsg = $errors->get_error_message('user_email') ) { ?> 132 132 <p class="error"><?php echo $errmsg ?></p> 133 <?php } ?> 133 <?php } ?> 134 134 <input name="user_email" type="text" id="user_email" value="<?php echo esc_attr($user_email) ?>" maxlength="200" /><br /><?php _e('(We’ll send your password to this address, so <strong>triple-check it</strong>.)') ?> 135 135 <?php … … 146 146 function signup_another_blog($blogname = '', $blog_title = '', $errors = '') { 147 147 global $current_user, $current_site; 148 148 149 149 if ( ! is_wp_error($errors) ) { 150 150 $errors = new WP_Error(); … … 164 164 ?> 165 165 <p><?php printf(__("Welcome back, %s. By filling out the form below, you can <strong>add another blog to your account</strong>. There is no limit to the number of blogs you can have, so create to your heart's content, but blog responsibly."), $current_user->display_name) ?></p> 166 167 <?php 168 $blogs = get_blogs_of_user($current_user->ID); 166 167 <?php 168 $blogs = get_blogs_of_user($current_user->ID); 169 169 if ( !empty($blogs) ) { ?> 170 170 <p> … … 177 177 </p> 178 178 <?php } ?> 179 179 180 180 <p><?php _e("If you’re not going to use a great blog domain, leave it for a new user. Now have at it!") ?></p> 181 181 <form id="setupform" method="post" action="wp-signup.php"> … … 239 239 240 240 ?> 241 241 242 242 <h2><?php printf( __('Get your own %s account in seconds'), $current_site->site_name ) ?></h2> 243 243 <form id="setupform" method="post" action="wp-signup.php"> … … 245 245 <?php do_action( "signup_hidden_fields" ); ?> 246 246 <?php show_user_form($user_name, $user_email, $errors); ?> 247 247 248 248 <p> 249 249 <?php if( $active_signup == 'blog' ) { ?> … … 253 253 <?php } else { ?> 254 254 <input id="signupblog" type="radio" name="signup_for" value="blog" <?php echo $signup['blog'] ?> /> 255 <label class="checkbox" for="signupblog"><?php _e('Gimme a blog!') ?></label> 256 <br /> 257 <input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup['user'] ?> /> 255 <label class="checkbox" for="signupblog"><?php _e('Gimme a blog!') ?></label> 256 <br /> 257 <input id="signupuser" type="radio" name="signup_for" value="user" <?php echo $signup['user'] ?> /> 258 258 <label class="checkbox" for="signupuser"><?php _e('Just a username, please.') ?></label> 259 259 <?php } ?> 260 260 </p> 261 261 262 262 <p class="submit"><input type="submit" name="submit" class="submit" value="<?php esc_attr_e('Next') ?>" /></p> 263 263 </form> … … 351 351 ?> 352 352 <h2><?php printf(__('Congratulations! Your new blog, %s, is almost ready.'), "<a href='http://{$domain}{$path}'>{$blog_title}</a>" ) ?></h2> 353 353 354 354 <p><?php _e('But, before you can start using your blog, <strong>you must activate it</strong>.') ?></p> 355 355 <p><?php printf(__('Check your inbox at <strong>%s</strong> and click the link given. It should arrive within 30 minutes.'), $user_email) ?></p>
Note: See TracChangeset
for help on using the changeset viewer.