Changes from branches/3.5/wp-admin/includes/schema.php at r24614 to branches/3.6/wp-admin/includes/schema.php at r24974
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.6/wp-admin/includes/schema.php
r24614 r24974 495 495 $fat_options = array( 'moderation_keys', 'recently_edited', 'blacklist_keys', 'uninstall_plugins' ); 496 496 497 $existing_options = $wpdb->get_col("SELECT option_name FROM $wpdb->options"); 497 $keys = "'" . implode( "', '", array_keys( $options ) ) . "'"; 498 $existing_options = $wpdb->get_col( "SELECT option_name FROM $wpdb->options WHERE option_name in ( $keys )" ); 498 499 499 500 $insert = ''; … … 506 507 $autoload = 'yes'; 507 508 508 $option = $wpdb->escape($option);509 509 if ( is_array($value) ) 510 510 $value = serialize($value); 511 $value = $wpdb->escape($value);512 511 if ( !empty($insert) ) 513 512 $insert .= ', '; 514 $insert .= "('$option', '$value', '$autoload')";513 $insert .= $wpdb->prepare( "(%s, %s, %s)", $option, $value, $autoload ); 515 514 } 516 515 … … 589 588 590 589 // Add caps for Administrator role 591 $role = &get_role('administrator');590 $role = get_role('administrator'); 592 591 $role->add_cap('switch_themes'); 593 592 $role->add_cap('edit_themes'); … … 622 621 623 622 // Add caps for Editor role 624 $role = &get_role('editor');623 $role = get_role('editor'); 625 624 $role->add_cap('moderate_comments'); 626 625 $role->add_cap('manage_categories'); … … 644 643 645 644 // Add caps for Author role 646 $role = &get_role('author');645 $role = get_role('author'); 647 646 $role->add_cap('upload_files'); 648 647 $role->add_cap('edit_posts'); … … 655 654 656 655 // Add caps for Contributor role 657 $role = &get_role('contributor');656 $role = get_role('contributor'); 658 657 $role->add_cap('edit_posts'); 659 658 $role->add_cap('read'); … … 662 661 663 662 // Add caps for Subscriber role 664 $role = &get_role('subscriber');663 $role = get_role('subscriber'); 665 664 $role->add_cap('read'); 666 665 $role->add_cap('level_0'); … … 675 674 $roles = array('administrator', 'editor'); 676 675 foreach ($roles as $role) { 677 $role = &get_role($role);676 $role = get_role($role); 678 677 if ( empty($role) ) 679 678 continue; … … 696 695 } 697 696 698 $role = &get_role('administrator');697 $role = get_role('administrator'); 699 698 if ( ! empty($role) ) { 700 699 $role->add_cap('delete_users'); … … 702 701 } 703 702 704 $role = &get_role('author');703 $role = get_role('author'); 705 704 if ( ! empty($role) ) { 706 705 $role->add_cap('delete_posts'); … … 708 707 } 709 708 710 $role = &get_role('contributor');709 $role = get_role('contributor'); 711 710 if ( ! empty($role) ) { 712 711 $role->add_cap('delete_posts'); … … 720 719 */ 721 720 function populate_roles_230() { 722 $role = &get_role( 'administrator' );721 $role = get_role( 'administrator' ); 723 722 724 723 if ( !empty( $role ) ) { … … 733 732 */ 734 733 function populate_roles_250() { 735 $role = &get_role( 'administrator' );734 $role = get_role( 'administrator' ); 736 735 737 736 if ( !empty( $role ) ) { … … 746 745 */ 747 746 function populate_roles_260() { 748 $role = &get_role( 'administrator' );747 $role = get_role( 'administrator' ); 749 748 750 749 if ( !empty( $role ) ) { … … 760 759 */ 761 760 function populate_roles_270() { 762 $role = &get_role( 'administrator' );761 $role = get_role( 'administrator' ); 763 762 764 763 if ( !empty( $role ) ) { … … 774 773 */ 775 774 function populate_roles_280() { 776 $role = &get_role( 'administrator' );775 $role = get_role( 'administrator' ); 777 776 778 777 if ( !empty( $role ) ) { … … 787 786 */ 788 787 function populate_roles_300() { 789 $role = &get_role( 'administrator' );788 $role = get_role( 'administrator' ); 790 789 791 790 if ( !empty( $role ) ) { … … 922 921 $insert = ''; 923 922 foreach ( $sitemeta as $meta_key => $meta_value ) { 924 $meta_key = $wpdb->escape( $meta_key );925 923 if ( is_array( $meta_value ) ) 926 924 $meta_value = serialize( $meta_value ); 927 $meta_value = $wpdb->escape( $meta_value );928 925 if ( !empty( $insert ) ) 929 926 $insert .= ', '; 930 $insert .= "( $network_id, '$meta_key', '$meta_value')";927 $insert .= $wpdb->prepare( "( %d, %s, %s)", $network_id, $meta_key, $meta_value ); 931 928 } 932 929 $wpdb->query( "INSERT INTO $wpdb->sitemeta ( site_id, meta_key, meta_value ) VALUES " . $insert );
Note: See TracChangeset
for help on using the changeset viewer.