Make WordPress Core

Context Navigation

← Previous Change
Next Change →

Changeset 47343 for branches/3.7/tests/phpunit/includes/factory.php

Timestamp:

02/22/2020 12:05:12 PM (6 years ago)

Author:

SergeyBiryukov

Message:

Build/Test Tools: Fix the Travis CI build for the 3.7 branch.

Among other fixes, this backports [26087], [26091], [26095], [26252], [26307], [26318], [26512], [26705], [26871], [26909-26910], [26940], [27086], [27168], [28799], [28873], [28943], [28961], [28964], [28966-28967], [29120], [29251], [29503], [29860], [29869], [29954], [30001], [30282], [30285], [30289-30291], [30513-30514], [30516-30521], [30524], [30526], [30529-30530], [31253-31254], [31257-31259], [31622], [40241], [40255], [40257], [40259], [40269], [40271], [40446], [40449], [40457], [40604], [40538], [40833], [41082], [41303], [41306], [44993].

Location:

Files:

: 2 edited

. (modified) (1 prop)
tests/phpunit/includes/factory.php (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/3.7

Property svn:mergeinfo changed

merged: 26087,26091,26095,26252,26307,26318,26512,26705,26871,26909-26910,26940,27086,27168,28799,28873,28943,28961,28964,28966-28967,29120,29251,29503,29860,29869,29954,30001,30282,30285,30289-30291,30513-30514,30516-30521,30524,30526,30529-30530,31253-31254,31257-31259,31622,40241,40255,40257,40259,40269,40271,40538,40604,44993

branches/3.7/tests/phpunit/includes/factory.php

-              r25660
+              r47343
         function create_object( $args ) {
+                global $wpdb;
                 $meta = isset( $args['meta'] ) ? $args['meta'] : array();
                 $user_id = isset( $args['user_id'] ) ? $args['user_id'] : get_current_user_id();
+                return wpmu_create_blog( $args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id'] );
+                // temp tables will trigger db errors when we attempt to reference them as new temp tables
+                $suppress = $wpdb->suppress_errors();
+                $blog = wpmu_create_blog( $args['domain'], $args['path'], $args['title'], $user_id, $meta, $args['site_id'] );
+                $wpdb->suppress_errors( $suppress );
+                return $blog;
+        }

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: