madeon (madeon) wrote in changelog,
madeon
madeon
changelog

[livejournal] r20297: LJSUP-10119: disabled delayed entries

Committer: sbelyaev
LJSUP-10119: disabled delayed entries
U   trunk/htdocs/editjournal.bml
Modified: trunk/htdocs/editjournal.bml
===================================================================
--- trunk/htdocs/editjournal.bml	2011-10-12 15:24:39 UTC (rev 20296)
+++ trunk/htdocs/editjournal.bml	2011-10-12 15:29:32 UTC (rev 20297)
@@ -867,11 +867,13 @@
 
         my $next_page = 0;
 
-        my $delayed_entries;
-        if ( $show eq 'recent' || !($year && $month && $day)) {
-            $delayed_entries = LJ::DelayedEntry->get_entries_by_journal($usejournal_u) || [];
-        } else {
-            $delayed_entries = LJ::DelayedEntry->get_entries_for_day_row($usejournal_u, $year, $month, $day );
+        my $delayed_entries = [];
+        if (!$LJ::DELAYED_ENTRIES_DISABLED) {
+            if ( $show eq 'recent' || !($year && $month && $day)) {
+                $delayed_entries = LJ::DelayedEntry->get_entries_by_journal($usejournal_u) || [];
+            } else {
+                $delayed_entries = LJ::DelayedEntry->get_entries_for_day_row($usejournal_u, $year, $month, $day );
+            }
         }
         my $delayed_count = scalar(@$delayed_entries) - $delayed_skip;
         my $show_usual = ($items_per_page - $delayed_count) > 0 ? $items_per_page - $delayed_count : 0;
@@ -887,6 +889,7 @@
                 dateformat => 'S2',
                 beforeid  => $start_from,
                 order     => 'logtime',
+                show_sticky_on_top => 1,
                 %ymd_req,
                 ($only_me_checked) ? ('posterid' =>  $remote->{'userid'}) : (),
             }))) || $delayed_entries) {

Tags: bml, livejournal, madeon, sbelyaev
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