syntax error bp-core-cssjs.php on line 50

[windhamdavid]

on revision <a href="​http://trac.buddypress.org/changeset/2593">#2593</a>
<<<<<<< .mine
function bp_core_confirmation_js()

[apeatling]

Looks like something conflicted when you updated via SVN - you probably edited that file. You need to revert it, or delete the file and update.

[windhamdavid]

don't hack the core!! no edits ~ dbl check with a fresh trunk.

[windhamdavid]

diffd em ~
<<<<<<< .mine
function bp_core_confirmation_js() { ?><script type="text/javascript"> jQuery(document).ready( function() { jQuery("a.confirm").click( function() { if ( confirm( '<?php _e( 'Are you sure?', 'buddypress' ) ?>' ) ) return true; else return false; }); });</script>
<?php } add_action( 'wp_head', 'bp_core_confirmation_js', 100 );
=======
evidently this one got on through svn b/c the file wasn't edited.

[windhamdavid]

fresh trunk is fine.