Changeset 12753
- Timestamp:
- 01/18/2010 10:21:36 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 15 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/admin.php
r12736 r12753 199 199 200 200 define('WP_IMPORTING', true); 201 if ( is_multisite() ) { 201 202 if ( is_multisite() ) 202 203 kses_init_filters(); // Always filter imported data with kses. 203 }204 204 205 205 call_user_func($wp_importers[$importer][2]); -
trunk/wp-admin/includes/schema.php
r12733 r12753 370 370 populate_roles_270(); 371 371 populate_roles_280(); 372 populate_roles_300(); 372 373 } 373 374 … … 591 592 } 592 593 594 /** 595 * Create and modify WordPress roles for WordPress 2.8. 596 * 597 * @since 2.8.0 598 */ 599 function populate_roles_300() { 600 $role =& get_role( 'administrator' ); 601 602 if ( !empty( $role ) ) { 603 $role->add_cap( 'update_core' ); 604 $role->add_cap( 'remove_user' ); 605 $role->add_cap( 'remove_users' ); 606 } 607 } 608 593 609 ?> -
trunk/wp-admin/includes/update.php
r12752 r12753 83 83 84 84 function core_update_footer( $msg = '' ) { 85 if ( is_multisite() && ! is_super_admin() )86 return false; 87 88 if ( !current_user_can(' manage_options') )85 if ( is_multisite() && !current_user_can('update_core') ) 86 return false; 87 88 if ( !current_user_can('update_core') ) 89 89 return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] ); 90 90 … … 105 105 106 106 case 'upgrade' : 107 if ( current_user_can('manage_options') ) { 108 return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', 'update-core.php', $cur->current); 109 break; 110 } 107 return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', 'update-core.php', $cur->current); 108 break; 111 109 112 110 case 'latest' : … … 119 117 120 118 function update_nag() { 121 if ( is_multisite() && ! is_super_admin() )119 if ( is_multisite() && !current_user_can('update_core') ) 122 120 return false; 123 121 … … 132 130 return false; 133 131 134 if ( current_user_can(' manage_options') )132 if ( current_user_can('update_core') ) 135 133 $msg = sprintf( __('WordPress %1$s is available! <a href="%2$s">Please update now</a>.'), $cur->current, 'update-core.php' ); 136 134 else … … 143 141 // Called directly from dashboard 144 142 function update_right_now_message() { 145 if ( is_multisite() && ! is_super_admin() )143 if ( is_multisite() && !current_user_can('update_core') ) 146 144 return false; 147 145 … … 149 147 150 148 $msg = sprintf( __('You are using <span class="b">WordPress %s</span>.'), $GLOBALS['wp_version'] ); 151 if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can(' manage_options') )149 if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('update_core') ) 152 150 $msg .= " <a href='update-core.php' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>'; 153 151 … … 170 168 171 169 function wp_plugin_update_rows() { 170 if ( !current_user_can('update_plugins' ) ) 171 return; 172 172 173 $plugins = get_site_transient( 'update_plugins' ); 173 174 if ( isset($plugins->response) && is_array($plugins->response) ) { … … 206 207 207 208 function wp_update_plugin($plugin, $feedback = '') { 208 if ( is_multisite() && !is_super_admin() )209 return false;210 211 212 209 if ( !empty($feedback) ) 213 210 add_filter('update_feedback', $feedback); … … 235 232 236 233 function wp_update_theme($theme, $feedback = '') { 237 238 234 if ( !empty($feedback) ) 239 235 add_filter('update_feedback', $feedback); … … 246 242 247 243 function wp_update_core($current, $feedback = '') { 248 249 244 if ( !empty($feedback) ) 250 245 add_filter('update_feedback', $feedback); … … 261 256 return false; 262 257 263 if ( current_user_can(' manage_options') )258 if ( current_user_can('update_core') ) 264 259 $msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' ); 265 260 else -
trunk/wp-admin/includes/upgrade.php
r12752 r12753 260 260 */ 261 261 function wp_upgrade() { 262 global $wp_current_db_version, $wp_db_version ;262 global $wp_current_db_version, $wp_db_version, $wpdb; 263 263 264 264 $wp_current_db_version = __get_option('db_version'); … … 277 277 upgrade_all(); 278 278 wp_cache_flush(); 279 280 if ( is_multisite() ) { 281 if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) ) { 282 $wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" ); 283 } else { 284 $wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" ); 285 } 286 } 279 287 } 280 288 endif; … … 352 360 if ( $wp_current_db_version < 11958 ) 353 361 upgrade_290(); 362 363 if ( $wp_current_db_version < 12751 ) 364 upgrade_300(); 354 365 355 366 maybe_disable_automattic_widgets(); … … 1007 1018 } 1008 1019 1020 /** 1021 * Execute changes made in WordPress 3.0. 1022 * 1023 * @since 3.0 1024 */ 1025 function upgrade_300() { 1026 populate_roles_300(); 1027 } 1009 1028 1010 1029 // The functions we use to actually do stuff -
trunk/wp-admin/menu.php
r12738 r12753 31 31 $menu[1] = array( '', 'read', 'separator0', '', 'wp-menu-separator' ); 32 32 $menu[2] = array(__('Site Admin'), '10', 'ms-admin.php', '', 'menu-top menu-top-first', 'menu-site', 'div'); 33 $submenu[ 'ms-admin.php' ][1] = array( __('Admin'), ' delete_users', 'ms-admin.php' );34 $submenu[ 'ms-admin.php' ][5] = array( __('Blogs'), ' delete_users', 'ms-sites.php' );35 $submenu[ 'ms-admin.php' ][10] = array( __('Users'), ' delete_users', 'ms-users.php' );36 $submenu[ 'ms-admin.php' ][20] = array( __('Themes'), ' delete_users', 'ms-themes.php' );37 $submenu[ 'ms-admin.php' ][25] = array( __('Options'), ' delete_users', 'ms-options.php' );38 $submenu[ 'ms-admin.php' ][30] = array( __('Upgrade'), ' delete_users', 'ms-upgrade-site.php' );33 $submenu[ 'ms-admin.php' ][1] = array( __('Admin'), 'super_admin', 'ms-admin.php' ); 34 $submenu[ 'ms-admin.php' ][5] = array( __('Blogs'), 'super_admin', 'ms-sites.php' ); 35 $submenu[ 'ms-admin.php' ][10] = array( __('Users'), 'super_admin', 'ms-users.php' ); 36 $submenu[ 'ms-admin.php' ][20] = array( __('Themes'), 'super_admin', 'ms-themes.php' ); 37 $submenu[ 'ms-admin.php' ][25] = array( __('Options'), 'super_admin', 'ms-options.php' ); 38 $submenu[ 'ms-admin.php' ][30] = array( __('Upgrade'), 'super_admin', 'ms-upgrade-site.php' ); 39 39 } 40 40 … … 106 106 if ( !is_multisite() ) 107 107 $submenu['themes.php'][10] = array(__('Editor'), 'edit_themes', 'theme-editor.php'); 108 if ( is_super_admin() ) 109 $submenu['themes.php'][15] = array(__('Add New Themes'), 'install_themes', 'theme-install.php'); 108 $submenu['themes.php'][15] = array(__('Add New Themes'), 'install_themes', 'theme-install.php'); 110 109 111 110 $update_plugins = get_site_transient( 'update_plugins' ); … … 118 117 $menu[65] = array( sprintf( __('Plugins %s'), "<span class='update-plugins count-$update_count'><span class='plugin-count'>" . number_format_i18n($update_count) . "</span></span>" ), 'activate_plugins', 'plugins.php', '', 'menu-top', 'menu-plugins', 'div' ); 119 118 $submenu['plugins.php'][5] = array( __('Installed'), 'activate_plugins', 'plugins.php' ); 120 if ( is_super_admin() ) { 121 /* translators: add new plugin */ 122 $submenu['plugins.php'][10] = array(_x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php'); 123 } 119 /* translators: add new plugin */ 120 $submenu['plugins.php'][10] = array(_x('Add New', 'plugin'), 'install_plugins', 'plugin-install.php'); 124 121 if ( !is_multisite() ) 125 122 $submenu['plugins.php'][15] = array( __('Editor'), 'edit_plugins', 'plugin-editor.php' ); -
trunk/wp-admin/options-general.php
r12752 r12753 293 293 <?php do_settings_fields('general', 'default'); ?> 294 294 <?php 295 if ( is_multisite() && is_dir( ABSPATH . LANGDIR ) && $dh = opendir( ABSPATH . LANGDIR ) ) 296 while( ( $lang_file = readdir( $dh ) ) !== false ) 295 296 $lang_files = array(); 297 if ( is_multisite() && is_dir( ABSPATH . LANGDIR ) && $dh = opendir( ABSPATH . LANGDIR ) ) { 298 while ( ( $lang_file = readdir( $dh ) ) !== false ) { 297 299 if ( substr( $lang_file, -3 ) == '.mo' ) 298 300 $lang_files[] = $lang_file; 299 $lang = get_option('WPLANG'); 300 301 if ( is_array($lang_files) && !empty($lang_files) ) { 302 ?> 301 } 302 } 303 304 if ( !empty($lang_files) ) { 305 ?> 303 306 <tr valign="top"> 304 307 <th width="33%" scope="row"><?php _e('Blog language:') ?></th> … … 309 312 </td> 310 313 </tr> 311 314 <?php 312 315 } // languages 313 316 ?> -
trunk/wp-admin/options.php
r12752 r12753 119 119 <input type="hidden" name="action" value="update" /> 120 120 <input type='hidden' name='option_page' value='options' /> 121 <?php if ( is_multisite() ) { ?>122 <p class="submit submit-top">123 <input type="submit" name="Submit" value="<?php _e('Save Changes') ?>" class="button-primary" />124 </p>125 <?php } ?>126 121 <table class="form-table"> 127 122 <?php -
trunk/wp-admin/plugins.php
r12752 r12753 232 232 233 233 $help = '<p>' . __('Plugins extend and expand the functionality of WordPress. Once a plugin is installed, you may activate it or deactivate it here.') . '</p>'; 234 if ( !is_multisite() || is_super_admin() ) {234 if ( current_user_can('edit_plugins') ) { 235 235 $help .= '<p>' . sprintf(__('If something goes wrong with a plugin and you can’t use WordPress, delete or rename that file in the <code>%s</code> directory and it will be automatically deactivated.'), WP_PLUGIN_DIR) . '</p>'; 236 236 $help .= '<p>' . sprintf(__('You can find additional plugins for your site by using the new <a href="%1$s">Plugin Browser/Installer</a> functionality or by browsing the <a href="http://wordpress.org/extend/plugins/">WordPress Plugin Directory</a> directly and installing manually. To <em>manually</em> install a plugin you generally just need to upload the plugin file into your <code>%2$s</code> directory. Once a plugin has been installed, you may activate it here.'), 'plugin-install.php', WP_PLUGIN_DIR) . '</p>'; … … 285 285 <div class="wrap"> 286 286 <?php screen_icon(); ?> 287 <h2><?php echo esc_html( $title ); if ( !is_multisite() || is_super_admin() ) { ?> <a href="plugin-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a><?php } ?></h2>287 <h2><?php echo esc_html( $title ); if ( current_user_can('install_plugins') ) { ?> <a href="plugin-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'plugin'); ?></a><?php } ?></h2> 288 288 289 289 <?php … … 326 326 } 327 327 328 if ( is_multisite() && !is_super_admin() ) { 329 $upgrade_plugins = false; 330 } 328 if ( !current_user_can('update_plugins') ) 329 $upgrade_plugins = array(); 331 330 332 331 $total_all_plugins = count($all_plugins); -
trunk/wp-admin/themes.php
r12752 r12753 68 68 69 69 require_once('admin-header.php'); 70 if ( is_multisite() && is_super_admin() ) {70 if ( is_multisite() && current_user_can('edit_themes') ) { 71 71 ?><div id="message0" class="updated fade"><p><?php _e('Administrator: new themes must be activated in the <a href="wpmu-themes.php">Themes Admin</a> page before they appear here.'); ?></p></div><?php 72 72 } … … 127 127 static $themes_update; 128 128 129 if ( is_multisite() && !is_super_admin() )129 if ( !current_user_can('update_themes' ) ) 130 130 return; 131 131 … … 160 160 <div class="wrap"> 161 161 <?php screen_icon(); ?> 162 <h2><?php echo esc_html( $title ); if ( ! is_multisite() || is_super_admin() ) { ?> <a href="theme-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php } ?></h2>162 <h2><?php echo esc_html( $title ); if ( !current_user_can('install_themes') ) { ?> <a href="theme-install.php" class="button add-new-h2"><?php echo esc_html_x('Add New', 'theme'); ?></a><?php } ?></h2> 163 163 164 164 <h3><?php _e('Current Theme'); ?></h3> … … 171 171 printf(__('%1$s %2$s by %3$s'), $ct->title, $ct->version, $ct->author) ; ?></h4> 172 172 <p class="theme-description"><?php echo $ct->description; ?></p> 173 <?php if ( ( !is_multisite() || is_super_admin()) && $ct->parent_theme ) { ?>173 <?php if ( current_user_can('edit_themes') && $ct->parent_theme ) { ?> 174 174 <p><?php printf(__('The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.'), $ct->title, str_replace( WP_CONTENT_DIR, '', $ct->template_dir ), str_replace( WP_CONTENT_DIR, '', $ct->stylesheet_dir ), $ct->title, $ct->parent_theme); ?></p> 175 175 <?php } else { ?> … … 266 266 <p class="description"><?php echo $description; ?></p> 267 267 <span class='action-links'><?php echo $actions ?></span> 268 <?php if ( ( !is_multisite() || is_super_admin()) && $parent_theme ) {268 <?php if ( current_user_can('edit_themes') && $parent_theme ) { 269 269 /* translators: 1: theme title, 2: template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?> 270 270 <p><?php printf(__('The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.'), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ), $title, $parent_theme); ?></p> … … 299 299 // List broken themes, if any. 300 300 $broken_themes = get_broken_themes(); 301 if ( ( !is_multisite() || is_super_admin()) && count( $broken_themes ) ) {301 if ( current_user_can('edit_themes') && count( $broken_themes ) ) { 302 302 ?> 303 303 -
trunk/wp-admin/upgrade.php
r12752 r12753 86 86 $backto = esc_url_raw( $backto ); 87 87 $backto = wp_validate_redirect($backto, __get_option( 'home' ) . '/'); 88 if ( $wpdb->get_row( "SELECT blog_id FROM {$wpdb->blog_versions} WHERE blog_id = '{$wpdb->blogid}'" ) ) {89 $wpdb->query( "UPDATE {$wpdb->blog_versions} SET db_version = '{$wp_db_version}' WHERE blog_id = '{$wpdb->blogid}'" );90 } else {91 $wpdb->query( "INSERT INTO {$wpdb->blog_versions} ( `blog_id` , `db_version` , `last_updated` ) VALUES ( '{$wpdb->blogid}', '{$wp_db_version}', NOW());" );92 }93 88 ?> 94 89 <h2><?php _e( 'Upgrade Complete' ); ?></h2> -
trunk/wp-admin/users.php
r12752 r12753 15 15 if ( !current_user_can('edit_users') ) 16 16 wp_die(__('Cheatin’ uh?')); 17 18 $del_cap_type = 'remove'; 19 if ( !is_multisite() && current_user_can('delete_users') ) 20 $del_cap_type = 'delete'; 17 21 18 22 $title = __('Users'); … … 44 48 check_admin_referer('bulk-users'); 45 49 46 if ( empty($_REQUEST['users'])) {50 if ( empty($_REQUEST['users']) ) { 47 51 wp_redirect($redirect); 48 52 exit(); … … 50 54 51 55 $editable_roles = get_editable_roles(); 52 if ( !$editable_roles[$_REQUEST['new_role']])56 if ( !$editable_roles[$_REQUEST['new_role']] ) 53 57 wp_die(__('You can’t give users that role.')); 54 58 55 59 $userids = $_REQUEST['users']; 56 60 $update = 'promote'; 57 foreach ($userids as $id) {61 foreach ( $userids as $id ) { 58 62 if ( ! current_user_can('edit_user', $id) ) 59 63 wp_die(__('You can’t edit that user.')); 60 64 // The new role of the current user must also have edit_users caps 61 if ($id == $current_user->ID && !$wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('edit_users')) {65 if ( $id == $current_user->ID && !$wp_roles->role_objects[$_REQUEST['new_role']]->has_cap('edit_users') ) { 62 66 $update = 'err_admin_role'; 63 67 continue; … … 82 86 } 83 87 84 if ( !current_user_can( 'delete_users') )88 if ( !current_user_can($del_cap_type . '_users') ) 85 89 wp_die(__('You can’t delete users.')); 86 90 … … 90 94 91 95 foreach ( (array) $userids as $id) { 92 if ( ! current_user_can( 'delete_user', $id) )96 if ( ! current_user_can($del_cap_type . '_user', $id) ) 93 97 wp_die(__('You can’t delete that user.')); 94 98 95 if ( $id == $current_user->ID) {99 if ( $id == $current_user->ID ) { 96 100 $update = 'err_admin_del'; 97 101 continue; 98 102 } 99 switch ($_REQUEST['delete_option']) {103 switch ( $_REQUEST['delete_option'] ) { 100 104 case 'delete': 101 if ( !is_multisite() ) {105 if ( !is_multisite() && current_user_can('delete_user', $id) ) 102 106 wp_delete_user($id); 103 } else {107 else 104 108 remove_user_from_blog($id, $blog_id); // WPMU only remove user from blog 105 }106 109 break; 107 110 case 'reassign': 108 if ( !is_multisite() ) {111 if ( !is_multisite() && current_user_can('delete_user', $id) ) 109 112 wp_delete_user($id, $_REQUEST['reassign_user']); 110 } else {113 else 111 114 remove_user_from_blog($id, $blog_id, $_REQUEST['reassign_user']); 112 }113 115 break; 114 116 } … … 131 133 } 132 134 133 if ( !current_user_can( 'delete_users') )135 if ( !current_user_can($del_cap_type . '_users') ) 134 136 $errors = new WP_Error('edit_users', __('You can’t delete users.')); 135 137 -
trunk/wp-includes/capabilities.php
r12733 r12753 717 717 $cap = $this->translate_level_to_cap( $cap ); 718 718 } 719 720 // Multisite super admin has all caps by definition. 721 if ( is_multisite() && is_super_admin() ) 722 return true; 719 723 720 724 $args = array_slice( func_get_args(), 1 ); … … 963 967 case 'install_themes': 964 968 case 'edit_themes': 969 case 'update_core': 970 case 'delete_user': 971 case 'delete_users': 965 972 // If multisite these caps are allowed only for super admins. 966 973 if ( is_multisite() && !is_super_admin() ) -
trunk/wp-includes/post.php
r12751 r12753 3252 3252 if ( 0 === strpos($file, $uploads['basedir']) ) //Check that the upload base exists in the file location 3253 3253 $url = str_replace($uploads['basedir'], $uploads['baseurl'], $file); //replace file location with url location 3254 elseif ( !is_multisite() ) { 3255 if ( false !== strpos($file, 'wp-content/uploads') ) 3256 $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 ); 3257 else 3258 $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir. 3259 } 3254 elseif ( false !== strpos($file, 'wp-content/uploads') ) 3255 $url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 ); 3256 else 3257 $url = $uploads['baseurl'] . "/$file"; //Its a newly uploaded file, therefor $file is relative to the basedir. 3260 3258 } 3261 3259 } -
trunk/wp-includes/version.php
r12456 r12753 16 16 * @global int $wp_db_version 17 17 */ 18 $wp_db_version = 12 329;18 $wp_db_version = 12751; 19 19 20 20 /** -
trunk/wp-includes/wp-db.php
r12733 r12753 371 371 $this->show_errors(); 372 372 373 if( is_multisite() ) { 374 $this->charset = 'utf8'; 375 if( defined( 'DB_COLLATE' ) && constant( 'DB_COLLATE' ) != '' ) { 376 $this->collate = constant( 'DB_COLLATE' ); 377 } else { 378 $this->collate = 'utf8_general_ci'; 379 } 380 } 373 if ( is_multisite() ) { 374 $this->charset = 'utf8'; 375 if ( defined( 'DB_COLLATE' ) && constant( 'DB_COLLATE' ) != '' ) 376 $this->collate = constant( 'DB_COLLATE' ); 377 else 378 $this->collate = 'utf8_general_ci'; 379 } 381 380 382 381 if ( defined('DB_CHARSET') ) … … 447 446 return new WP_Error('invalid_db_prefix', /*WP_I18N_DB_BAD_PREFIX*/'Invalid database prefix'/*/WP_I18N_DB_BAD_PREFIX*/); 448 447 449 if( is_multisite() ) { 450 451 } else { 452 453 } 454 if ( isset( $this->base_prefix ) )448 if ( is_multisite() ) 449 $old_prefix = ''; 450 else 451 $old_prefix = $prefix; 452 453 if ( isset( $this->base_prefix ) ) 455 454 $old_prefix = $this->base_prefix; 456 455 $this->base_prefix = $prefix; … … 665 664 return false; 666 665 667 668 if( is_multisite() ) {669 670 if( defined( 'ERRORLOGFILE' ) )671 672 if( defined( 'DIEONDBERROR' ) )673 674 675 676 677 678 679 680 681 682 666 // If there is an error then take note of it 667 if ( is_multisite() ) { 668 $msg = "WordPress database error: [$str]\n{$this->last_query}\n"; 669 if ( defined( 'ERRORLOGFILE' ) ) 670 error_log( $msg, 3, CONSTANT( 'ERRORLOGFILE' ) ); 671 if ( defined( 'DIEONDBERROR' ) ) 672 die( $msg ); 673 } else { 674 $str = htmlspecialchars($str, ENT_QUOTES); 675 $query = htmlspecialchars($this->last_query, ENT_QUOTES); 676 677 print "<div id='error'> 678 <p class='wpdberror'><strong>WordPress database error:</strong> [$str]<br /> 679 <code>$query</code></p> 680 </div>"; 681 } 683 682 } 684 683 … … 740 739 function db_connect( $query = "SELECT" ) { 741 740 global $db_list, $global_db_list; 742 if ( is_array( $db_list ) == false )741 if ( is_array( $db_list ) == false ) 743 742 return true; 744 743 745 if ( $this->blogs != '' && preg_match("/(" . $this->blogs . "|" . $this->users . "|" . $this->usermeta . "|" . $this->site . "|" . $this->sitemeta . "|" . $this->sitecategories . ")/i",$query) ) {744 if ( $this->blogs != '' && preg_match("/(" . $this->blogs . "|" . $this->users . "|" . $this->usermeta . "|" . $this->site . "|" . $this->sitemeta . "|" . $this->sitecategories . ")/i",$query) ) { 746 745 $action = 'global'; 747 746 $details = $global_db_list[ mt_rand( 0, count( $global_db_list ) -1 ) ];
Note: See TracChangeset
for help on using the changeset viewer.