Changeset 11901

Timestamp:

03/19/2018 04:43:51 PM (7 years ago)

Author:

djpaul

Message:

Templates, Nouveau: code pass.

Location:

trunk/src/bp-templates/bp-nouveau

Files:

• buddypress-functions.php (modified) (2 diffs)
• buddypress/blogs/blogs-loop.php (modified) (1 diff)
• buddypress/groups/groups-loop.php (modified) (1 diff)
• buddypress/members/members-loop.php (modified) (1 diff)
• includes/ajax.php (modified) (6 diffs)
• includes/groups/ajax.php (modified) (1 diff)
• includes/messages/ajax.php (modified) (2 diffs)

trunk/src/bp-templates/bp-nouveau/buddypress-functions.php

@@ -464 +464 @@
      * @since 3.0.0
      *
-     * @param  array $templates Array of templates.
-     * @uses   apply_filters() call 'bp_legacy_theme_compat_page_templates_directory_only' and return false
-     *                         to use the defined page template for component's directory and its single items
+     * @param array $templates Array of templates.
+     *
      * @return array
      */
@@ -477 +476 @@
          * @param bool $value Whether or not we are viewing a directory.
          */
-        if ( true === (bool) apply_filters( 'bp_legacy_theme_compat_page_templates_directory_only', ! bp_is_directory() ) ) {
+        if ( true === (bool) apply_filters( 'bp_nouveau_theme_compat_page_templates_directory_only', ! bp_is_directory() ) ) {
             return $templates;
         }

trunk/src/bp-templates/bp-nouveau/buddypress/blogs/blogs-loop.php

@@ -2 +2 @@
 /**
  * BuddyPress - Blogs Loop
- *
- * Querystring is set via AJAX in _inc/ajax.php - bp_legacy_theme_object_filter().
  *
  * @since 3.0.0

trunk/src/bp-templates/bp-nouveau/buddypress/groups/groups-loop.php

@@ -2 +2 @@
 /**
  * BuddyPress - Groups Loop
- *
- * Querystring is set via AJAX in _inc/ajax.php - bp_legacy_theme_object_filter().
  *
  * @since 3.0.0

trunk/src/bp-templates/bp-nouveau/buddypress/members/members-loop.php

@@ -2 +2 @@
 /**
  * BuddyPress - Members Loop
- *
- * Querystring is set via AJAX in _inc/ajax.php - bp_legacy_theme_object_filter()
  *
  * @since 3.0.0

trunk/src/bp-templates/bp-nouveau/includes/ajax.php

@@ -12 +12 @@
  * Load the template loop for the current object.
  *
- * @return string Prints template loop for the specified object
  * @since 3.0.0
+ *
+ * @return string Template loop for the specified object
  */
 function bp_nouveau_ajax_object_template_loader() {
@@ -41 +42 @@
         $scope = '';
         if ( ! empty( $_POST['scope'] ) ) {
-            $scope = $_POST['scope'];
+            $scope = sanitize_text_field( $_POST['scope'] );
         }
 
@@ -71 +72 @@
                 break;
             default:
-                $feed_url = home_url( bp_get_activity_root_slug() . '/feed/' );
+                $feed_url = bp_get_sitewide_activity_feed_link();
                 break;
         }
 
-        $result['feed_url'] = apply_filters( 'bp_legacy_theme_activity_feed_url', $feed_url, $scope );
+        $result['feed_url'] = apply_filters( 'bp_nouveau_ajax_object_template_loader', $feed_url, $scope );
     }
 
@@ -113 +114 @@
 
     $template_path = bp_locate_template( array( $template_part ), false );
-    $template_path = apply_filters( 'bp_legacy_object_template_path', $template_path );
+    $template_path = apply_filters( 'bp_nouveau_object_template_path', $template_path );
 
     load_template( $template_path );
@@ -129 +130 @@
  *
  * @param array $ajax_actions {
- *      Multi-dimensional array. For example:
+ *      Optional. Multi-dimensional array. For example:
  *
  *      $ajax_actions = array(
@@ -140 +141 @@
  *     - 'nopriv' indicates whether the AJAX action is allowed for logged-out users.
  * }
+ *
  * @return array
  */

trunk/src/bp-templates/bp-nouveau/includes/groups/ajax.php

@@ -376 +376 @@
 
     foreach ( (array) $_POST['users'] as $user_id ) {
-        $invited[ $user_id ] = groups_invite_user(
+        $invited[ (int) $user_id ] = groups_invite_user(
             array(
                 'user_id'  => $user_id,

trunk/src/bp-templates/bp-nouveau/includes/messages/ajax.php

@@ -55 +55 @@
     // Validate recipients
     if ( empty( $_POST['send_to'] ) || ! is_array( $_POST['send_to'] ) ) {
-        $response['feedback'] = __( 'Your message was not sent. Please enter at least one @username.', 'buddypress' );
+        $response['feedback'] = __( 'Your message was not sent. Please enter at least one username.', 'buddypress' );
 
         wp_send_json_error( $response );
@@ -70 +70 @@
         'subject'    => $_POST['subject'],
         'content'    => $_POST['message_content'],
-        'error_type' => 'wp_error'
+        'error_type' => 'wp_error',
     ) );