[geeklog-cvs] geeklog: Ensure PLG_templateSetVars (and therefore CUSTOM_templa...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/18130f0d6d24
changeset: 7017:18130f0d6d24
user:      Dirk Haun <dirk at haun-online.de>
date:      Sat May 09 17:48:14 2009 +0200
description:
Ensure PLG_templateSetVars (and therefore CUSTOM_templateSetVars) is called properly when the "Skip Preview" option is disabled (bug #0000880)

diffstat:

3 files changed, 6 insertions(+), 6 deletions(-)
public_html/docs/history |    2 ++
public_html/submit.php   |    2 +-
system/lib-comment.php   |    8 +++-----

diffs (53 lines):

diff -r 5aca2dbf9ac3 -r 18130f0d6d24 public_html/docs/history
--- a/public_html/docs/history	Sat May 09 16:44:43 2009 +0200
+++ b/public_html/docs/history	Sat May 09 17:48:14 2009 +0200
@@ -11,6 +11,8 @@
 + Comment moderation and editable comments, by Jared Wenerd
 
 Other changes:
+- Ensure PLG_templateSetVars (and therefore CUSTOM_templateSetVars) is called
+  properly when the "Skip Preview" option is disabled (bug #0000880) [Dirk]
 - Fixed handling of multi-byte encoded texts when limiting the content of feed
   entries to a certain amount of characters (reported by alank) [Dirk]
 - Added a verbose logging option to the search class and make it default to off
diff -r 5aca2dbf9ac3 -r 18130f0d6d24 public_html/submit.php
--- a/public_html/submit.php	Sat May 09 16:44:43 2009 +0200
+++ b/public_html/submit.php	Sat May 09 17:48:14 2009 +0200
@@ -209,9 +209,9 @@
     $storyform->set_var('story_date', $story->EditElements('unixdate'));
     $storyform->set_var('lang_preview', $LANG12[32]);
 
+    PLG_templateSetVars('story', $storyform);
     if (($_CONF['skip_preview'] == 1) ||
             (isset($_POST['mode']) && ($_POST['mode'] == $LANG12[32]))) {
-        PLG_templateSetVars('story', $storyform);
         $storyform->set_var('save_button',
                             '<input name="mode" type="submit" value="'
                             . $LANG12[8] . '"' . XHTML . '>');
diff -r 5aca2dbf9ac3 -r 18130f0d6d24 system/lib-comment.php
--- a/system/lib-comment.php	Sat May 09 16:44:43 2009 +0200
+++ b/system/lib-comment.php	Sat May 09 17:48:14 2009 +0200
@@ -993,20 +993,18 @@
                 $comment_template->set_var('lang_preview', $LANG03[14]);
             }
 
+            PLG_templateSetVars('comment', $comment_template); 
             if ($mode == $LANG03[28] || ($mode == 'edit' && $_CONF['skip_preview'] == 1)) { 
-                //for editing
-                PLG_templateSetVars ('comment', $comment_template); 
+                // for editing
                 $comment_template->set_var('save_option',
                     '<input type="submit" name="mode" value="' . $LANG03[29]
                     . '"' . XHTML . '>');
             } elseif ($mode == $LANG03[34] || ($mode == 'editsubmission' && $_CONF['skip_preview'] == 1))  {
-                //editing submission comment
-                PLG_templateSetVars ('comment', $comment_template);
+                // editing submission comment
                 $comment_template->set_var('save_option',
                     '<input type="submit" name="mode" value="' . $LANG03[35]
                     . '"' . XHTML . '>');
             } elseif (($_CONF['skip_preview'] == 1) || ($mode == $LANG03[14])) {
-                PLG_templateSetVars ('comment', $comment_template);
                 $comment_template->set_var('save_option',
                     '<input type="submit" name="mode" value="' . $LANG03[11]
                     . '"' . XHTML . '>');