2 replies [Last post]
marafa@drupal.org's picture
Offline
InternationalizationizerNot Kulvik
Joined: 10/07/2007
Juice: 139
Was this information Helpful?

hi
i updated today via bzr (cronjob)
and now when i look at my demo.site i get this error:
Parse error: syntax error, unexpected T_SL in /var/www/html/mix/sites/all/modules/ubercart/uc_cart/uc_cart.module on line 1779
which is referring to this line:

<<<<<<< TREE
=======
  unset($_SESSION['new_user']);

  if (module_exists('workflow_ng')) {
    workflow_ng_invoke_event('checkout_complete', $order);
  }

>>>>>>> MERGE-SOURCE

after hashing the naughty lines (i presume its bzr syntax) i get this:

Fatal error: Call to undefined function user_access() in /var/www/html/mix/modules/block/block.module on line 68

thanks

ps. where am i supposed to write this stuff up?

Mohammed Arafa

Ryan's picture
Offline
Joined: 08/07/2007
Juice: 15438
Re: this mornings update-revision 486

It looks like the update didn't work... had you modified that module yourself? If so, it could have failed on the merge... I'd just checkout from Bazaar in a new directory and copy the clean uc_cart.module over.

marafa@drupal.org's picture
Offline
InternationalizationizerNot Kulvik
Joined: 10/07/2007
Juice: 139
Re: Re: this mornings update-revision 486

delete the ubercart directory and did a bzr checkout
dint work
deleted the tables
and reinstalled
voila no more error!

thing is .. i dint save the work i did since my last install profile was created :/
restart!

Mohammed Arafa