Changeset 373 for trunk/bp-xprofile/bp-xprofile-cssjs.php

Timestamp:

10/07/2008 07:16:51 AM (18 years ago)

Author:

apeatling

Message:

Bug fixes:

• Fixed group avatar upload issues
• Fixed validation on group name/desc/news
• Fixed support for ​https://
• Base support for upcoming home theme and widgets
• Re-factored JS and CSS inclusion with wp_enqueue_script/styles

File:

• trunk/bp-xprofile/bp-xprofile-cssjs.php (modified) (4 diffs)

trunk/bp-xprofile/bp-xprofile-cssjs.php

@@ -3 +3 @@
 function xprofile_add_signup_css() {
         if ( $_SERVER['SCRIPT_NAME'] == '/wp-signup.php' )
-                echo '<link rel="stylesheet" href="' . get_option('siteurl') . '/wp-content/mu-plugins/bp-xprofile/css/signup.css" type="text/css" />';
+                echo '<link rel="stylesheet" href="' . site_url() . '/wp-content/mu-plugins/bp-xprofile/css/signup.css" type="text/css" />';
 }
 add_action( 'wp_head', 'xprofile_add_signup_css' );
@@ -10 +10 @@
 function xprofile_add_admin_css() {
         if ( strpos( $_GET['page'], 'xprofile' ) !== false ) {
-                echo '<link rel="stylesheet" href="' . get_option('siteurl') . '/wp-content/mu-plugins/bp-xprofile/css/admin.css" type="text/css" />';
+                echo '<link rel="stylesheet" href="' . site_url() . '/wp-content/mu-plugins/bp-xprofile/css/admin.css" type="text/css" />';
         }
 }
@@ -18 +18 @@
 function xprofile_add_admin_js() {
         if ( strpos( $_GET['page'], 'xprofile' ) !== false ) {
-                wp_enqueue_script( 'bp-xprofile-admin-js', get_option('siteurl') . "/wp-content/mu-plugins/bp-xprofile/js/admin.js" );
+                wp_enqueue_script( 'bp-xprofile-admin-js', site_url() . "/wp-content/mu-plugins/bp-xprofile/js/admin.js" );
                 add_action( 'admin_head', 'bp_core_add_cropper_js' );
         }
@@ -24 +24 @@
 add_action( 'admin_menu', 'xprofile_add_admin_js' );
 
+function xprofile_add_cropper_js() {
+        global $bp;
+
+        if ( $_SERVER['SCRIPT_NAME'] == '/wp-activate.php' || $bp['current_action'] == 'change-avatar' || ( isset($_GET['page']) && $_GET['page'] == 'bp-xprofile.php' ) ) {
+                wp_enqueue_script('jquery');
+                wp_enqueue_script('prototype');
+                wp_enqueue_script('scriptaculous-root');
+                wp_enqueue_script('cropper');
+                add_action( 'wp_head', 'bp_core_add_cropper_js' );
+        }
+        
+        if ( isset($_GET['page']) && $_GET['page'] == 'bp-xprofile.php' ) {
+                add_action( 'admin_head', 'bp_core_add_cropper_js' );
+        }
+}
+add_action( 'activate_header', 'xprofile_add_cropper_js' );
+add_action( 'template_redirect', 'xprofile_add_cropper_js' );
+add_action( 'admin_menu', 'xprofile_add_cropper_js' );
+
 ?>