Changeset 6790

Timestamp:

02/13/2013 07:45:27 PM (12 years ago)

Author:

r-a-y

Message:

Use network_site_url() to build the 'ajaxurl' JS variable.

Previously, for sites on HTTPS and using the 'FORCE_SSL_ADMIN' constant,
when viewing the frontend of the site on HTTP, the 'ajaxurl' JS
variable would still use HTTPS due to the usage of admin_url().

This would break most BP AJAX actions that use check_admin_referer() to
verify the nonce.

Switching admin_url() to use network_site_url() fixes this problem.

Fixes #4761. Props will_c.

Location:

trunk

Files:

• bp-core/bp-core-cssjs.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)

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

@@ -151 +151 @@
 ?>
 
-    <script type="text/javascript">var ajaxurl = '<?php echo admin_url( 'admin-ajax.php' ); ?>';</script>
+    <script type="text/javascript">var ajaxurl = '<?php echo network_site_url( '/wp-admin/admin-ajax.php' ); ?>';</script>
 
 <?php

trunk/bp-templates/bp-legacy/buddypress-functions.php

@@ -279 +279 @@
         <script type="text/javascript" charset="utf-8">
             /* <![CDATA[ */
-            var ajaxurl = '<?php echo admin_url( 'admin-ajax.php' ); ?>';
+            var ajaxurl = '<?php echo network_site_url( '/wp-admin/admin-ajax.php' ); ?>';
             /* ]]> */
         </script>