Skip to:
Content

BuddyPress.org

Opened 16 years ago

Closed 16 years ago

#2623 closed defect (bug) (fixed)

[3232] was a bad merge

Reported by: mdawaffe Owned by:
Priority: blocker Milestone: 1.5
Component: Core Version:
Severity: Keywords:
Cc:

Description

It looks like [3232] was a bad merge.

For example,
​http://trac.buddypress.org/browser/trunk/bp-core.php?rev=3232#L40 requires a file that does not exist in trunk nor branches/1.2

Change History (4)

#1 @johnjamesjacoby
16 years ago

We talked about this in #buddypress-dev and on bpdevel.wordpress.com, so thanks for confirming.

I'll give it a shot this week and see what I can come up with.

#2 @mercime
16 years ago

Thank you JJJ
Same with trunk-r3239
Fatal error: require(): Failed opening required '/xxxxx/wp-content/plugins/buddypress/bp-core/bp-core-activation.php' xxxx in /xxxxx/wp-content/plugins/buddypress/bp-core.php on line 42

(xxxx's mine)

#3 @apeatling
16 years ago

Looks like the require() calls were merged back in mistakenly, they are not needed in the trunk.

#4 @apeatling
16 years ago

  • Resolution → fixed
  • Status new → closed

(In [3242]) Fixing require of file that no longer exists in the trunk. All activation functions have been moved to bp-core-signup.php. Fixes #2623

Note: See TracTickets for help on using tickets.