[livejournal] r20248: LJSUP-10058: edit urls for usual posts h...

U   trunk/htdocs/editjournal.bml

Modified: trunk/htdocs/editjournal.bml
===================================================================
--- trunk/htdocs/editjournal.bml	2011-10-07 08:18:56 UTC (rev 20247)
+++ trunk/htdocs/editjournal.bml	2011-10-07 08:55:14 UTC (rev 20248)
@@ -99,7 +99,7 @@
                                 'security'    => $entry->security,
                                 'logtime'     => $entry->logtime,
                                 'delayed_obj' => $entry,
-                                'delayedid'    => $ditem,
+                                'delayedid'   => $ditem,
                                 'itemid'      => 0,
                                 'anum'        => 0,
                                };
@@ -217,7 +217,7 @@
 
             $ret .= "<p class='b-editentry-ctrls'>";
             my $ditemid_get;
-            if ($entry) {
+            if ($entry->is_delayed) {
                 $ditemid_get = $getextra ? ("$getextra&amp;delayedid=" . $entry->delayedid) : ("?delayedid=" . $entry->delayedid);
             } else {
                 $ditemid_get = $getextra ? ("$getextra&amp;itemid=" . $entry->ditemid) : ("?itemid=" . $entry->ditemid);
@@ -306,7 +306,7 @@
         ###
 
         my $ditemid = $GET{'itemid'} || $POST{'itemid'} || 0;
-        my $delayedid = $GET{'delayedid'} || $POST{'delayedid'} || 0;    
+        my $delayedid = $GET{'delayedid'} || $POST{'delayedid'};    
 
         if ( $ditemid || $delayedid ) {
             my $itemid = 0;
@@ -768,7 +768,7 @@
             my $ditemid = ($res{'events_1_itemid'} * 256) + $res{'events_1_anum'};
             my $ditemid_get = '';
             
-            if ($delayedid) {
+            if ($delayedid && $delayedid != 0) {
                 $ditemid_get = $getextra ? "$getextra&delayedid=$delayedid" : "?delayedid=$delayedid";
             } else { 
                 $ditemid_get = $getextra ? "$getextra&itemid=$ditemid" : "?itemid=$ditemid";