[dev] Re: [cvs] commit: imp message.php

[Jon Knepher]

$spam_link appears to need to be after $identity to avoid a notice....

Index: message.php
===================================================================
RCS file: /repository/imp/message.php,v
retrieving revision 2.446
diff -u -r2.446 message.php
--- message.php 6 Jan 2003 22:41:58 -0000       2.446
+++ message.php 7 Jan 2003 05:59:33 -0000
@@ -345,12 +345,6 @@
 $self_link = Horde::addParameter($self_link, 'index', $index);
 $self_link = Horde::addParameter($self_link, 'start', $msgindex);
 
-/* Generate the spam link. */
-if ($conf['spam']['reporting']) {
-    $spam_link = Horde::addParameter($self_link, 'actionID', SPAM_REPORT);
-    $spam_link = Horde::addParameter($spam_link, 'identity', $identity);
-}
-
 /* Generate the print link. */
 $print_link = '';
 $print_params = array('actionID' => PRINT_MESSAGE, 'index' => $index);
@@ -443,6 +437,12 @@
             $status .= Horde::img($flag . '.gif', $desc);
         }
     }
+}
+
+/* Generate the spam link. */
+if ($conf['spam']['reporting']) {
+    $spam_link = Horde::addParameter($self_link, 'actionID', SPAM_REPORT);
+    $spam_link = Horde::addParameter($spam_link, 'identity', $identity);
 }
 
 /* Determine if we need to show the Reply to All link. */

Jon

> ----- Message from jan at ammma.de ---------
>     Date: Mon,  6 Jan 2003 14:42:00 -0800 (PST)
>     From: Jan Schneider <jan at ammma.de>
> Reply-To: dev at lists.horde.org
>  Subject: [cvs] commit: imp message.php
>       To: cvs at lists.horde.org
> 
> jan         2003/01/06 14:41:59 PST
> 
>   Modified files:
>     .                    message.php
>   Log:
>   Generate message status after all headers have been parsed.
>   Fixes the identity not being preset correctly when replying/forwarding a
>   message.
> 
>   Revision  Changes    Path
>   2.446     +37 -37    imp/message.php
> 
>   Chora Links:
>   http://cvs.horde.org/diff.php/imp/message.php?r1=2.445&r2=2.446&ty=u
> 
> --
> To unsubscribe, mail: cvs-unsubscribe at lists.horde.org
> 
> 
> ----- End message from jan at ammma.de -----



-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-keys
Size: 967 bytes
Desc: PGP Public Key
Url : http://lists.horde.org/archives/dev/attachments/20030106/b8677962/attachment.bin