fixed blog sticky forms

git-svn-id: http://code.elgg.org/elgg/trunk@8377 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/blog/actions/blog/save.php b/mod/blog/actions/blog/save.php
index dbbe25e04cd55c922f836f465c1ccb001a00674d..18ddce7862d0a3588756d96b26c8f8fee3fd981e 100644 (file)
--- a/mod/blog/actions/blog/save.php
+++ b/mod/blog/actions/blog/save.php
@@ -6,7 +6,7 @@
  */
 
 // start a new sticky form session in case of failure
-//elgg_make_sticky_form();
+elgg_make_sticky_form('blog');
 
 // store errors to pass along
 $error = FALSE;
@@ -129,7 +129,7 @@ if (!$error) {
 if (!$error) {
        if ($blog->save()) {
                // remove sticky form entries
-               elgg_clear_sticky_form();
+               elgg_clear_sticky_form('blog');
 
                // remove autosave draft if exists
                $blog->clearAnnotations('blog_auto_save');

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 861f75f959f349fa7db8e8ee9cecf6c521b5bd62..326b224bb9cf265f22b957d65baca44b2f57c5d4 100644 (file)
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -361,6 +361,14 @@ function blog_prepare_form_vars($post = NULL, $revision = NULL) {
                'draft_warning' => '',
        );
 
+       if (elgg_is_sticky_form('blog')) {
+               foreach (array_keys($values) as $field) {
+                       $values[$field] = elgg_get_sticky_value('blog', $field);
+               }
+       }
+
+       elgg_clear_sticky_form('blog');
+
        if (!$post) {
                return $values;
        }
@@ -389,8 +397,6 @@ function blog_prepare_form_vars($post = NULL, $revision = NULL) {
                $values['draft_warning'] = elgg_echo('blog:messages:warning:draft');
        }
 
-       elgg_clear_sticky_form('blog');
-
        return $values;
 }