Андрей (andy) wrote in changelog,
Андрей
andy
changelog

[livejournal] r18870: LJSUP-8575 (on QotD crossposts, disable ...

Committer: ailyin
LJSUP-8575 (on QotD crossposts, disable comments and link back to the original entry)
U   trunk/bin/upgrading/s2layers/core1.s2
U   trunk/cgi-bin/LJ/Widget/EntryForm.pm
Modified: trunk/bin/upgrading/s2layers/core1.s2
===================================================================
--- trunk/bin/upgrading/s2layers/core1.s2	2011-04-13 10:46:00 UTC (rev 18869)
+++ trunk/bin/upgrading/s2layers/core1.s2	2011-04-14 02:12:59 UTC (rev 18870)
@@ -1153,6 +1153,11 @@
 }
 set text_meta_groups = "Custom Friends Groups";
 
+property string text_meta_origin_url {
+    des = "Text for 'Original entry at'";
+}
+set text_meta_origin_url = "Original entry at";
+
 property string text_copyr_agree {
     des = "Text for copyright post agree"; }
 set text_copyr_agree= "Hereinafter I give my permission to reproduce in any form";
@@ -2092,6 +2097,9 @@
     elseif ($which == "groups") {
         return $*text_meta_groups;
     }
+    elseif ( $which == "origin_url" ) {
+        return $*text_meta_origin_url;
+    }
     else {
         return $which;
     }

Modified: trunk/cgi-bin/LJ/Widget/EntryForm.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/EntryForm.pm	2011-04-13 10:46:00 UTC (rev 18869)
+++ trunk/cgi-bin/LJ/Widget/EntryForm.pm	2011-04-14 02:12:59 UTC (rev 18870)
@@ -1247,7 +1247,7 @@
             $$onload .= " changeSecurityOptions('$defaultjournal');";
         }
 
-        my $disabled = $remote->is_identity && !$self->usejournal;
+        my $disabled = $remote && $remote->is_identity && !$self->usejournal;
 
         $out .= LJ::html_submit(
             'action:update',

Tags: andy, livejournal, pm, s2
Subscribe
  • Post a new comment

    Error

    Anonymous comments are disabled in this journal

    default userpic

    Your reply will be screened

    Your IP address will be recorded 

  • 0 comments