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

diff --git a/mod/bookmarks/lib/bookmarks.php b/mod/bookmarks/lib/bookmarks.php
index 815330e2c52a64246ed30d3bb3beea7da02aae20..9a9dff18cf1e56e5e377742c969eb29db477d5af 100644 (file)
--- 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;
                }
        }
 

diff --git a/mod/bookmarks/views/default/forms/bookmarks/save.php b/mod/bookmarks/views/default/forms/bookmarks/save.php
index 4930aacdb80142422251173b0b82c227a4af8f81..88628320230f1a616aaba40cbd436d8d0e523512 100644 (file)
--- a/mod/bookmarks/views/default/forms/bookmarks/save.php
+++ b/mod/bookmarks/views/default/forms/bookmarks/save.php
@@ -5,7 +5,7 @@
  * @package Bookmarks
  */
 
-// once elgg_view stops throwing all sorts of junk into $vars, we can use
+// once elgg_view stops throwing all sorts of junk into $vars, we can use extract()
 $title = elgg_extract('title', $vars, '');
 $desc = elgg_extract('description', $vars, '');
 $address = elgg_extract('address', $vars, '');

diff --git a/mod/file/lib/file.php b/mod/file/lib/file.php
index 6ca49e95b0305f5678a59c8e4f9394974e4b9150..6f94772e758393726348f45f0dbd15f6529c10fc 100644 (file)
--- a/mod/file/lib/file.php
+++ b/mod/file/lib/file.php
@@ -26,13 +26,16 @@ function file_prepare_form_vars($file = null) {
 
        if ($file) {
                foreach (array_keys($values) as $field) {
-                       $values[$field] = $file->$field;
+                       if (isset($file->$field)) {
+                               $values[$field] = $file->$field;
+                       }
                }
        }
 
        if (elgg_is_sticky_form('file')) {
-               foreach (array_keys($values) as $field) {
-                       $values[$field] = elgg_get_sticky_value('file', $field);
+               $sticky_values = elgg_get_sticky_values('file');
+               foreach ($sticky_values as $key => $value) {
+                       $values[$key] = $value;
                }
        }
 

diff --git a/mod/groups/lib/discussion.php b/mod/groups/lib/discussion.php
index 1813c87aa0c7979d0d2583ea9d7d68661caea557..94d212ef62c03ab956bfd8844cef170342e8d1f3 100644 (file)
--- a/mod/groups/lib/discussion.php
+++ b/mod/groups/lib/discussion.php
@@ -218,13 +218,16 @@ function discussion_prepare_form_vars($topic = NULL) {
 
        if ($topic) {
                foreach (array_keys($values) as $field) {
-                       $values[$field] = $topic->$field;
+                       if (isset($topic->$field)) {
+                               $values[$field] = $topic->$field;
+                       }
                }
        }
 
        if (elgg_is_sticky_form('topic')) {
-               foreach (array_keys($values) as $field) {
-                       $values[$field] = elgg_get_sticky_value('topic', $field);
+               $sticky_values = elgg_get_sticky_values('topic');
+               foreach ($sticky_values as $key => $value) {
+                       $values[$key] = $value;
                }
        }
 

diff --git a/mod/pages/lib/pages.php b/mod/pages/lib/pages.php
index 079155190a41e4d2d01190a45d7dc50f13b3979b..0a6f3a6203b85072aef381e45f3e35a2ee69be60 100644 (file)
--- a/mod/pages/lib/pages.php
+++ b/mod/pages/lib/pages.php
@@ -26,13 +26,16 @@ function pages_prepare_form_vars($page = null, $parent_guid = 0) {
 
        if ($page) {
                foreach (array_keys($values) as $field) {
-                       $values[$field] = $page->$field;
+                       if (isset($page->$field)) {
+                               $values[$field] = $page->$field;
+                       }
                }
        }
 
        if (elgg_is_sticky_form('page')) {
-               foreach (array_keys($values) as $field) {
-                       $values[$field] = elgg_get_sticky_value('page', $field);
+               $sticky_values = elgg_get_sticky_values('page');
+               foreach ($sticky_values as $key => $value) {
+                       $values[$key] = $value;
                }
        }