diff options
| author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-03-26 13:11:23 +0000 |
|---|---|---|
| committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-03-26 13:11:23 +0000 |
| commit | 962164b97ca11d9ce155bde60f198d226ff060d3 (patch) | |
| tree | 84dd5d6f7979a8c4e6efa08dd32c60b9bedffc27 /mod/bookmarks/lib | |
| parent | 83658fe7fe28332e73ca6600793ddb8bb52f5b3a (diff) | |
| download | elgg-962164b97ca11d9ce155bde60f198d226ff060d3.tar.gz elgg-962164b97ca11d9ce155bde60f198d226ff060d3.tar.bz2 | |
Fixes #3239 entities aren't blown away in form prepare functions any more
git-svn-id: http://code.elgg.org/elgg/trunk@8839 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/bookmarks/lib')
| -rw-r--r-- | mod/bookmarks/lib/bookmarks.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/mod/bookmarks/lib/bookmarks.php b/mod/bookmarks/lib/bookmarks.php index 815330e2c..9a9dff18c 100644 --- a/mod/bookmarks/lib/bookmarks.php +++ b/mod/bookmarks/lib/bookmarks.php @@ -14,7 +14,7 @@ function bookmarks_prepare_form_vars($bookmark = null) { // input names => defaults $values = array( - 'title' => get_input('title', ''), + 'title' => get_input('title', ''), // bookmarklet support 'address' => get_input('address', ''), 'description' => '', 'access_id' => ACCESS_DEFAULT, @@ -27,13 +27,16 @@ function bookmarks_prepare_form_vars($bookmark = null) { if ($bookmark) { foreach (array_keys($values) as $field) { - $values[$field] = $bookmark->$field; + if (isset($bookmark->$field)) { + $values[$field] = $bookmark->$field; + } } } if (elgg_is_sticky_form('bookmarks')) { - foreach (array_keys($values) as $field) { - $values[$field] = elgg_get_sticky_value('bookmarks', $field); + $sticky_values = elgg_get_sticky_values('bookmarks'); + foreach ($sticky_values as $key => $value) { + $values[$key] = $value; } } |