multisite: Performance –> heavy switch_to_blog

Hello,
thanks for your plugin!
We have big performance problems in wp-admin, so I looked inside your code.

1. You use switch_to_blog( 1 ); and restore_current_blog(); in many places. These functions are very heavy. –> You can just use update_blog_option( 1, ..., ... ); instead of switching to blog 1 to use update_option( ..., ... );.

2. You switch to blog 1 even if you are on blog 1: You only check for is_multisite(). Please check for is_multisite() && !is_main_site() instead.

3. In two places you call the global $blog_id. (in function ask() and function warning() ). –> Just call here again if ( ( is_multisite() && ( !is_main_site() ...

This didn’t solve my performance issue yet, but it’s a better way of handling multisite.
Thanks in advance

http://ww.wp.xz.cn/extend/plugins/better-wp-security/