Changeset 6826

Timestamp:

03/01/2013 08:57:30 PM (12 years ago)

Author:

boonebgorges

Message:

Improvements in the way ajaxurl is determined

Introduces bp_core_ajax_url() for easier unit testing

Switches bp_core_ajax_url() back to using admin_url(), but now it's more
sensitive to various HTTPS setups, including FORCE_SSL_ADMIN.

Corresponding unit test: ​https://github.com/buddypress/BuddyPress-Unit-Tests/commit/5cec5a154f568c83fd97f1e8ce5333a9183f2a4d

Partially reverts r6790. See #4850.

Fixes #4761

Props r-a-y

File:

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

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

@@ -138 +138 @@
 
 /**
- * bp_core_add_ajax_url_js()
- *
  * Adds AJAX target URL so themes can access the WordPress AJAX functionality.
  *
@@ -147 +145 @@
 ?>
 
-    <script type="text/javascript">var ajaxurl = '<?php echo network_site_url( '/wp-admin/admin-ajax.php' ); ?>';</script>
+    <script type="text/javascript">var ajaxurl = '<?php echo bp_core_ajax_url(); ?>';</script>
 
 <?php
 }
 add_action( 'wp_head', 'bp_core_add_ajax_url_js' );
+
+/**
+ * Returns the proper value for BP's ajaxurl
+ *
+ * Designed to be sensitive to FORCE_SSL_ADMIN and non-standard multisite
+ * configurations.
+ *
+ * @since BuddyPress (1.7)
+ *
+ * @return string
+ */
+function bp_core_ajax_url() {
+    return apply_filters( 'bp_core_ajax_url', admin_url( 'admin-ajax.php', is_ssl() ? 'admin' : 'http' ) );
+}