Closed (fixed)
Project:
Lost & found issues
Version:
5.x-1.x-dev
Component:
Code
Priority:
Critical
Category:
Bug report
Assigned:
Reporter:
Created:
16 Nov 2007 at 14:55 UTC
Updated:
4 Mar 2008 at 21:22 UTC
Jump to comment: Most recent, Most recent file
Comments
Comment #1
stevenpatzWhat is in the apache error log?
Comment #2
stevenpatzComment #3
jurgenhaasI'm running on IIS6 and the weblog has no error whatsoever.
Comment #4
stevenpatzComment #5
fusion94 commentedI'm seeing the same issue. My php_error.log shows this:
PHP Parse error: syntax error, unexpected T_SL in /Users/fusion94/Documents/Projects/Clients/Content Circle/ccsvn/ccsvn/website/trunk/website/modules/restapi/restapi.module on line 41
Thoughts?
Comment #6
scottweaver commentedThis is what is on line 41:
<<<<<<< restapi.module
And then there are subsequent diff markers from there on out.
I will see if I can figure what stays and what goes.
-scott
Comment #7
scottweaver commentedPosted so I could change the issue subject that I messed up on my last post...sorry :(
-scott
Comment #8
scottweaver commentedOk, the easiest thing is to just checkout the code from CVS. For those not wanting to do this, I have attached the current code from the HEAD.
-scott
Comment #9
zostay commentedSorry about that. I wasn't diligent when checking for conflicts before committing. This is now corrected in the 5.x-1.x branch. Drupal should be generating a fresh tarball tonight.
Comment #10
Anonymous (not verified) commentedAutomatically closed -- issue fixed for two weeks with no activity.