Notice: Trying to get property of non-object in _content_lock_add_unload_js() (line 357

I can't get the same error but perhaps if you give a bit more detail.

So steps are:

* User A with permission to lock edits node
* User B with permission to lock(?) views locked node (node/XX) OR tries to edit locked node (node/XXX/edit)??
* User A clicks cancel to get out of edit mode
* User A sees the error message? On the node page (node/XX) after clicking cancel and being redirected?

It seems that this happens whenever a node was locked when a form was created but the lock has gone by the time it is submitted. I managed to reproduce this by opening the same edit form twice in different windows within a browser session and then submitting both of them. On the second this error appears.

Looking at the code, it doesn't cope with the the case where content_lock_fetch_lock() returns an empty value. It would seem sensible that it should.

I am getting this issue too.

And now the patch...

This takes the result of loading the lock and loads either $lock->ajax_key or FALSE into a variable to pass into the $settings array.

I've just checked this using drush make with the following build.make snippet;

; Content lock
projects[content_lock][type] = module
projects[content_lock][subdir] = contrib
projects[content_lock][download][type] = git
projects[content_lock][download][revision] = 7.x-1.x
; http://drupal.org/node/1530620
projects[content_lock][patch][] = "http://drupal.org/files/content_lock-fix_notice-1530620-4.patch"

The result was successful. Drush make reports;

gold@shipnet ~/Projects/mts (gold/master) $ drush make --no-core --projects=content_lock build.make 
Make new site in the current directory? (y/n): y
Drush make restricted to the following entries:                                                              [ok]
Projects: content_lock
content_lock cloned from http://git.drupal.org/project/content_lock.git.                                     [ok]
Checked out revision 7.x-1.x.                                                                                [ok]
content_lock patched with content_lock-fix_notice-1530620-4.patch.                                           [ok]
Generated PATCHES.txt file for content_lock                                                                  [ok]

Running the above steps in the description does not return any notices now.

I'm not the appropriate one to test this though. Could someone else please test and update the Status.

Hmm... Have spotted a second this like this. Will roll it into this patch soon.

Adding to the fix in #4 to also include one from the content_lock_release_own_item() function. Tidied up a drupal_set_message() that is never reached also.

Updating with a proper issue summary template

This still applied to the current version, and it prevents the ajax error.

Thanks guys, will be in next release very soon.

Correcting issue status, see #2698635: Issue statuses changing by themselves?.