Changeset 3300 for trunk/bp-core/bp-core-cssjs.php

Timestamp:

10/24/2010 09:22:29 PM (16 years ago)

Author:

djpaul

Message:

Fixed #2676

File:

• trunk/bp-core/bp-core-cssjs.php (modified) (3 diffs)

trunk/bp-core/bp-core-cssjs.php

@@ -39 +39 @@
         <style type="text/css">
                 ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a { background-image: url( <?php echo BP_PLUGIN_URL . '/bp-core/images/admin_menu_icon.png' ?> ) !important; background-position: -1px -32px; }
-                ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a { background-position: -1px 0; }
+                ul#adminmenu li.toplevel_page_bp-general-settings:hover .wp-menu-image a, ul#adminmenu li.toplevel_page_bp-general-settings.wp-has-current-submenu .wp-menu-image a { background-position: -1px 0; }
                 ul#adminmenu li.toplevel_page_bp-general-settings .wp-menu-image a img { display: none; }
         </style>
@@ -50 +50 @@
         global $current_blog;
 
-        if ( $current_blog->blog_id != BP_ROOT_BLOG )
+        if ( bp_core_is_multisite() && $current_blog->blog_id != BP_ROOT_BLOG )
                 return false;
 ?>
@@ -83 +83 @@
         global $bp;
 
-        $image = apply_filters( 'bp_inline_cropper_image', getimagesize( $bp->avatar_admin->image->dir ) );
+        $image = apply_filters( 'bp_inline_cropper_image', getimagesize( BP_AVATAR_UPLOAD_PATH . $bp->avatar_admin->image->dir ) );
         $aspect_ratio = 1;
 
-        /* Calculate Aspect Ratio */
+        // Calculate Aspect Ratio
         if ( (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) && ( (int) constant( 'BP_AVATAR_FULL_WIDTH' ) != (int) constant( 'BP_AVATAR_FULL_HEIGHT' ) ) )
                 $aspect_ratio = (int) constant( 'BP_AVATAR_FULL_WIDTH' ) / (int) constant( 'BP_AVATAR_FULL_HEIGHT' );