Changeset 9514

Timestamp:

02/18/2015 09:01:53 PM (10 years ago)

Author:

djpaul

Message:

Replace use of __DIR__ as it is not supported on PHP 5.2.

Fixes #6083 again.

Location:

trunk

Files:

• src/bp-activity/bp-activity-classes.php (modified) (1 diff)
• src/bp-blogs/bp-blogs-classes.php (modified) (1 diff)
• src/bp-core/bp-core-classes.php (modified) (1 diff)
• src/bp-friends/bp-friends-classes.php (modified) (1 diff)
• src/bp-groups/bp-groups-classes.php (modified) (1 diff)
• src/bp-members/bp-members-classes.php (modified) (1 diff)
• src/bp-messages/bp-messages-classes.php (modified) (1 diff)
• src/bp-notifications/bp-notifications-classes.php (modified) (1 diff)
• src/bp-xprofile/bp-xprofile-classes.php (modified) (1 diff)
• tests/phpunit/includes/define-constants.php (modified) (1 diff)

trunk/src/bp-activity/bp-activity-classes.php

@@ -10 +10 @@
 defined( 'ABSPATH' ) || exit;
 
-require __DIR__ . '/classes/class-bp-activity-activity.php';
-require __DIR__ . '/classes/class-bp-activity-feed.php';
-require __DIR__ . '/classes/class-bp-activity-query.php';
+require dirname( __FILE__ ) . '/classes/class-bp-activity-activity.php';
+require dirname( __FILE__ ) . '/classes/class-bp-activity-feed.php';
+require dirname( __FILE__ ) . '/classes/class-bp-activity-query.php';

trunk/src/bp-blogs/bp-blogs-classes.php

@@ -11 +11 @@
 defined( 'ABSPATH' ) || exit;
 
-require __DIR__ . '/classes/class-bp-blogs-blog.php';
+require dirname( __FILE__ ) . '/classes/class-bp-blogs-blog.php';

trunk/src/bp-core/bp-core-classes.php

@@ -10 +10 @@
 defined( 'ABSPATH' ) || exit;
 
-require __DIR__ . '/classes/class-bp-user-query.php';
-require __DIR__ . '/classes/class-bp-core-user.php';
-require __DIR__ . '/classes/class-bp-date-query.php';
-require __DIR__ . '/classes/class-bp-core-notification.php';
-require __DIR__ . '/classes/class-bp-button.php';
-require __DIR__ . '/classes/class-bp-embed.php';
-require __DIR__ . '/classes/class-bp-walker-nav-menu.php';
-require __DIR__ . '/classes/class-bp-walker-nav-menu-checklist.php';
-require __DIR__ . '/classes/class-bp-suggestions.php';
-require __DIR__ . '/classes/class-bp-members-suggestions.php';
-require __DIR__ . '/classes/class-bp-recursive-query.php';
+require dirname( __FILE__ ) . '/classes/class-bp-user-query.php';
+require dirname( __FILE__ ) . '/classes/class-bp-core-user.php';
+require dirname( __FILE__ ) . '/classes/class-bp-date-query.php';
+require dirname( __FILE__ ) . '/classes/class-bp-core-notification.php';
+require dirname( __FILE__ ) . '/classes/class-bp-button.php';
+require dirname( __FILE__ ) . '/classes/class-bp-embed.php';
+require dirname( __FILE__ ) . '/classes/class-bp-walker-nav-menu.php';
+require dirname( __FILE__ ) . '/classes/class-bp-walker-nav-menu-checklist.php';
+require dirname( __FILE__ ) . '/classes/class-bp-suggestions.php';
+require dirname( __FILE__ ) . '/classes/class-bp-members-suggestions.php';
+require dirname( __FILE__ ) . '/classes/class-bp-recursive-query.php';

trunk/src/bp-friends/bp-friends-classes.php

@@ -10 +10 @@
 defined( 'ABSPATH' ) || exit;
 
-require __DIR__ . '/classes/class-bp-friends-friendship.php';
+require dirname( __FILE__ ) . '/classes/class-bp-friends-friendship.php';

trunk/src/bp-groups/bp-groups-classes.php

@@ -10 +10 @@
 defined( 'ABSPATH' ) || exit;
 
-require __DIR__ . '/classes/class-bp-group-extension.php';
-require __DIR__ . '/classes/class-bp-group-member-query.php';
-require __DIR__ . '/classes/class-bp-groups-group.php';
-require __DIR__ . '/classes/class-bp-groups-member-suggestions.php';
-require __DIR__ . '/classes/class-bp-groups-member.php';
+require dirname( __FILE__ ) . '/classes/class-bp-group-extension.php';
+require dirname( __FILE__ ) . '/classes/class-bp-group-member-query.php';
+require dirname( __FILE__ ) . '/classes/class-bp-groups-group.php';
+require dirname( __FILE__ ) . '/classes/class-bp-groups-member-suggestions.php';
+require dirname( __FILE__ ) . '/classes/class-bp-groups-member.php';

trunk/src/bp-members/bp-members-classes.php

@@ -10 +10 @@
 defined( 'ABSPATH' ) || exit;
 
-require __DIR__ . '/classes/class-bp-signup.php';
+require dirname( __FILE__ ) . '/classes/class-bp-signup.php';

trunk/src/bp-messages/bp-messages-classes.php

@@ -10 +10 @@
 defined( 'ABSPATH' ) || exit;
 
-require __DIR__ . '/classes/class-bp_messages-thread.php';
-require __DIR__ . '/classes/class-bp-messages-message.php';
-require __DIR__ . '/classes/class-bp-messages-notice.php';
+require dirname( __FILE__ ) . '/classes/class-bp_messages-thread.php';
+require dirname( __FILE__ ) . '/classes/class-bp-messages-message.php';
+require dirname( __FILE__ ) . '/classes/class-bp-messages-notice.php';

trunk/src/bp-notifications/bp-notifications-classes.php

@@ -14 +14 @@
 defined( 'ABSPATH' ) || exit;
 
-require __DIR__ . '/classes/class-bp-notifications-notification.php';
+require dirname( __FILE__ ) . '/classes/class-bp-notifications-notification.php';

trunk/src/bp-xprofile/bp-xprofile-classes.php

@@ -10 +10 @@
 defined( 'ABSPATH' ) || exit;
 
-require __DIR__ . '/classes/class-bp-xprofile-group.php';
-require __DIR__ . '/classes/class-bp-xprofile-field.php';
-require __DIR__ . '/classes/class-bp-xprofile-profiledata.php';
-require __DIR__ . '/classes/class-bp-xprofile-field-type.php';
-require __DIR__ . '/classes/class-bp-xprofile-field-type-datebox.php';
-require __DIR__ . '/classes/class-bp-xprofile-field-type-checkbox.php';
-require __DIR__ . '/classes/class-bp-xprofile-field-type-radiobutton.php';
-require __DIR__ . '/classes/class-bp-xprofile-field-type-multiselectbox.php';
-require __DIR__ . '/classes/class-bp-xprofile-field-type-selectbox.php';
-require __DIR__ . '/classes/class-bp-xprofile-field-type-textarea.php';
-require __DIR__ . '/classes/class-bp-xprofile-field-type-textbox.php';
-require __DIR__ . '/classes/class-bp-xprofile-field-type-number.php';
-require __DIR__ . '/classes/class-bp-xprofile-field-type-url.php';
-require __DIR__ . '/classes/class-bp-xprofile-field-type-placeholder.php';
-require __DIR__ . '/classes/class-bp-xprofile-query.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-group.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-field.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-profiledata.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-field-type.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-field-type-datebox.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-field-type-checkbox.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-field-type-radiobutton.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-field-type-multiselectbox.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-field-type-selectbox.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-field-type-textarea.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-field-type-textbox.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-field-type-number.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-field-type-url.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-field-type-placeholder.php';
+require dirname( __FILE__ ) . '/classes/class-bp-xprofile-query.php';

trunk/tests/phpunit/includes/define-constants.php

@@ -29 +29 @@
         define( 'WP_ROOT_DIR', getenv( 'WP_DEVELOP_DIR' ) );
     } else {
-        define( 'WP_ROOT_DIR', dirname( dirname( dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ) ) ) );
+        define( 'WP_ROOT_DIR', dirname( dirname( dirname( dirname( dirname( dirname( dirname( dirname( __FILE__ ) ) ) ) ) ) ) ) );
     }