Changeset 41447
- Timestamp:
- 09/19/2017 01:41:08 PM (6 years ago)
- Location:
- branches/4.0
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/4.0
- Property svn:mergeinfo changed
/branches/4.1 (added) merged: 41446 /branches/4.2 merged: 41445 /branches/4.3 merged: 41444 /branches/4.4 (added) merged: 41434 /branches/4.5 (added) merged: 41415-41416 /branches/4.6 merged: 41414 /trunk reverse-merged: 18512
- Property svn:mergeinfo changed
-
branches/4.0/src/wp-admin/includes/class-wp-plugins-list-table.php
r29707 r41447 397 397 if ( $is_active ) { 398 398 if ( current_user_can( 'manage_network_plugins' ) ) 399 $actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&plugin=' . $plugin_file. '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Network Deactivate') . '</a>';399 $actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&plugin=' . urlencode( $plugin_file ) . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Network Deactivate') . '</a>'; 400 400 } else { 401 401 if ( current_user_can( 'manage_network_plugins' ) ) 402 $actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&plugin=' . $plugin_file. '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>';402 $actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&plugin=' . urlencode( $plugin_file ) . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin for all sites in this network') . '" class="edit">' . __('Network Activate') . '</a>'; 403 403 if ( current_user_can( 'delete_plugins' ) && ! is_plugin_active( $plugin_file ) ) 404 $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&checked[]=' . $plugin_file. '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';404 $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&checked[]=' . urlencode( $plugin_file ) . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>'; 405 405 } 406 406 } else { 407 407 if ( $is_active ) { 408 $actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&plugin=' . $plugin_file. '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Deactivate') . '</a>';408 $actions['deactivate'] = '<a href="' . wp_nonce_url('plugins.php?action=deactivate&plugin=' . urlencode( $plugin_file ) . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'deactivate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Deactivate this plugin') . '">' . __('Deactivate') . '</a>'; 409 409 } else { 410 $actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&plugin=' . $plugin_file. '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>';410 $actions['activate'] = '<a href="' . wp_nonce_url('plugins.php?action=activate&plugin=' . urlencode( $plugin_file ) . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'activate-plugin_' . $plugin_file) . '" title="' . esc_attr__('Activate this plugin') . '" class="edit">' . __('Activate') . '</a>'; 411 411 412 412 if ( ! is_multisite() && current_user_can('delete_plugins') ) 413 $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&checked[]=' . $plugin_file. '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>';413 $actions['delete'] = '<a href="' . wp_nonce_url('plugins.php?action=delete-selected&checked[]=' . urlencode( $plugin_file ) . '&plugin_status=' . $context . '&paged=' . $page . '&s=' . $s, 'bulk-plugins') . '" title="' . esc_attr__('Delete this plugin') . '" class="delete">' . __('Delete') . '</a>'; 414 414 } // end if $is_active 415 415 … … 417 417 418 418 if ( ( ! is_multisite() || $screen->in_admin( 'network' ) ) && current_user_can('edit_plugins') && is_writable(WP_PLUGIN_DIR . '/' . $plugin_file) ) 419 $actions['edit'] = '<a href="plugin-editor.php?file=' . $plugin_file. '" title="' . esc_attr__('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>';419 $actions['edit'] = '<a href="plugin-editor.php?file=' . urlencode( $plugin_file ) . '" title="' . esc_attr__('Open this file in the Plugin Editor') . '" class="edit">' . __('Edit') . '</a>'; 420 420 } // end if $context 421 421 -
branches/4.0/src/wp-admin/includes/template.php
r32203 r41447 793 793 foreach ( array_keys( $templates ) as $template ) { 794 794 $selected = selected( $default, $templates[ $template ], false ); 795 echo "\n\t<option value='" . $templates[ $template ] . "' $selected>$template</option>";795 echo "\n\t<option value='" . esc_attr( $templates[ $template ] ) . "' $selected>" . esc_html( $template ) . "</option>"; 796 796 } 797 797 } -
branches/4.0/src/wp-admin/plugin-editor.php
r28310 r41447 94 94 95 95 if ( ( ! empty( $_GET['networkwide'] ) && ! is_plugin_active_for_network($file) ) || ! is_plugin_active($file) ) 96 activate_plugin($file, "plugin-editor.php?file= $file&phperror=1", ! empty( $_GET['networkwide'] ) ); // we'll override this later if the plugin can be included without fatal error97 98 wp_redirect( self_admin_url("plugin-editor.php?file= $file&a=te&scrollto=$scrollto") );96 activate_plugin($file, "plugin-editor.php?file=" . urlencode( $file ) . "&phperror=1", ! empty( $_GET['networkwide'] ) ); // we'll override this later if the plugin can be included without fatal error 97 98 wp_redirect( self_admin_url("plugin-editor.php?file=" . urlencode( $file ) . "&a=te&scrollto=$scrollto") ); 99 99 exit; 100 100 } … … 182 182 if ( is_plugin_active($plugin) ) { 183 183 if ( is_writeable($real_file) ) 184 echo sprintf(__('Editing <strong>%s</strong> (active)'), $file);184 echo sprintf(__('Editing <strong>%s</strong> (active)'), esc_html( $file ) ); 185 185 else 186 echo sprintf(__('Browsing <strong>%s</strong> (active)'), $file);186 echo sprintf(__('Browsing <strong>%s</strong> (active)'), esc_html( $file ) ); 187 187 } else { 188 188 if ( is_writeable($real_file) ) 189 echo sprintf(__('Editing <strong>%s</strong> (inactive)'), $file);189 echo sprintf(__('Editing <strong>%s</strong> (inactive)'), esc_html( $file ) ); 190 190 else 191 echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), $file);191 echo sprintf(__('Browsing <strong>%s</strong> (inactive)'), esc_html( $file ) ); 192 192 } 193 193 ?></big> … … 233 233 } 234 234 ?> 235 <li<?php echo $file == $plugin_file ? ' class="highlight"' : ''; ?>><a href="plugin-editor.php?file=<?php echo urlencode( $plugin_file ) ?>&plugin=<?php echo urlencode( $plugin ) ?>"><?php echo $plugin_file?></a></li>235 <li<?php echo $file == $plugin_file ? ' class="highlight"' : ''; ?>><a href="plugin-editor.php?file=<?php echo urlencode( $plugin_file ) ?>&plugin=<?php echo urlencode( $plugin ) ?>"><?php echo esc_html( $plugin_file ); ?></a></li> 236 236 <?php endforeach; ?> 237 237 </ul> -
branches/4.0/src/wp-admin/plugins.php
r40177 r41447 18 18 $action = $wp_list_table->current_action(); 19 19 20 $plugin = isset($_REQUEST['plugin']) ? $_REQUEST['plugin']: '';20 $plugin = isset($_REQUEST['plugin']) ? wp_unslash( $_REQUEST['plugin'] ) : ''; 21 21 $s = isset($_REQUEST['s']) ? urlencode($_REQUEST['s']) : ''; 22 22 … … 38 38 check_admin_referer('activate-plugin_' . $plugin); 39 39 40 $result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin=' . $plugin), is_network_admin() );40 $result = activate_plugin($plugin, self_admin_url('plugins.php?error=true&plugin=' . urlencode( $plugin ) ), is_network_admin() ); 41 41 if ( is_wp_error( $result ) ) { 42 42 if ( 'unexpected_output' == $result->get_error_code() ) { 43 $redirect = self_admin_url('plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . $plugin. "&plugin_status=$status&paged=$page&s=$s");43 $redirect = self_admin_url('plugins.php?error=true&charsout=' . strlen($result->get_error_data()) . '&plugin=' . urlencode( $plugin ) . "&plugin_status=$status&paged=$page&s=$s"); 44 44 wp_redirect(add_query_arg('_error_nonce', wp_create_nonce('plugin-activation-error_' . $plugin), $redirect)); 45 45 exit; … … 68 68 check_admin_referer('bulk-plugins'); 69 69 70 $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked']: array();70 $plugins = isset( $_POST['checked'] ) ? (array) wp_unslash( $_POST['checked'] ) : array(); 71 71 72 72 if ( is_network_admin() ) { … … 108 108 109 109 if ( isset( $_GET['plugins'] ) ) 110 $plugins = explode( ',', $_GET['plugins']);110 $plugins = explode( ',', wp_unslash( $_GET['plugins'] ) ); 111 111 elseif ( isset( $_POST['checked'] ) ) 112 $plugins = (array) $_POST['checked'];112 $plugins = (array) wp_unslash( $_POST['checked'] ); 113 113 else 114 114 $plugins = array(); … … 182 182 check_admin_referer('bulk-plugins'); 183 183 184 $plugins = isset( $_POST['checked'] ) ? (array) $_POST['checked']: array();184 $plugins = isset( $_POST['checked'] ) ? (array) wp_unslash( $_POST['checked'] ) : array(); 185 185 // Do not deactivate plugins which are already deactivated. 186 186 if ( is_network_admin() ) { … … 214 214 215 215 //$_POST = from the plugin form; $_GET = from the FTP details screen. 216 $plugins = isset( $_REQUEST['checked'] ) ? (array) $_REQUEST['checked']: array();216 $plugins = isset( $_REQUEST['checked'] ) ? (array) wp_unslash( $_REQUEST['checked'] ) : array(); 217 217 if ( empty( $plugins ) ) { 218 218 wp_redirect( self_admin_url("plugins.php?plugin_status=$status&paged=$page&s=$s") ); -
branches/4.0/src/wp-admin/theme-editor.php
r29206 r41447 69 69 $file = $allowed_files['style.css']; 70 70 } else { 71 $relative_file = $file;71 $relative_file = wp_unslash( $file ); 72 72 $file = $theme->get_stylesheet_directory() . '/' . $relative_file; 73 73 } … … 126 126 <?php endif; 127 127 128 $ description = get_file_description( $file );128 $file_description = get_file_description( $relative_file ); 129 129 $file_show = array_search( $file, array_filter( $allowed_files ) ); 130 if ( $description != $file_show ) 131 $description .= ' <span>(' . $file_show . ')</span>'; 130 $description = esc_html( $file_description ); 131 if ( $file_description != $file_show ) { 132 $description .= ' <span>(' . esc_html( $file_show ) . ')</span>'; 133 } 132 134 ?> 133 135 <div class="wrap"> … … 178 180 echo "\t</ul>\n\t<h3>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h3>\n\t<ul>\n"; 179 181 180 $file_description = get_file_description( $absolute_filename);182 $file_description = esc_html( get_file_description( $filename ) ); 181 183 if ( $file_description != basename( $filename ) ) 182 $file_description .= '<br /><span class="nonessential">(' . $filename. ')</span>';184 $file_description .= '<br /><span class="nonessential">(' . esc_html( $filename ) . ')</span>'; 183 185 184 186 if ( $absolute_filename == $file )
Note: See TracChangeset
for help on using the changeset viewer.