Revert r32842, r32942 for now.

* The date-split view is visually disjoint; loss of distinguishing bullets makes the lines harder to read and distinguish, while the extra date headers cause significant vertical expansion of log lists when searched on specific criteria.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9a8dce1..a8c1e67 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -28,7 +28,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Removed $wgAlternateMaster, use $wgLBFactoryConf
 * (bug 13562) Misspelled option $wgUserNotifedOnAllChanges changed to
   $wgUserNotifiedOnAllChanges
-* $wgDateGroupedLogs can be set to false to restore old log formatting
 
 === New features in 1.13 ===
 
@@ -64,7 +63,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13490) Show upload/file size limit on upload form
 * Redesign of Special:Userrights
 * Make rev_deleted log entries more intelligible.
-* Logs are grouped under date headings similar to enhanced changes list
 * (6943) Added PAGESINCATEGORY: magic word
 * (13624) Fix regression with manual thumb= parameter on images
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 26a0752..e3efe8c 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2498,11 +2498,6 @@ $wgLogActions = array(
        'suppress/block'        => 'blocklogentry',
 );
 
-/**
- * Group logs under date headings similar to enhanced recent changes.
- */
-$wgDateGroupedLogs = true;
-
 /**
  * Experimental preview feature to fetch rendered text
  * over an XMLHttpRequest from JavaScript instead of

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index b9a70a7..7a24ba1 100644 (file)
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -136,19 +136,13 @@ class LogEventsList {
        private function getTitlePattern( $pattern ) {
                return Xml::checkLabel( wfMsg( 'log-title-wildcard' ), 'pattern', 'pattern', $pattern );
        }
-
-
-       protected function getWrapperElement() {
-               global $wgDateGroupedLogs;
-               return $wgDateGroupedLogs ? 'div' : 'ul';
-       }
        
        public function beginLogEventsList() {
-               return Xml::openElement( $this->getWrapperElement() ) . "\n";
+               return "<ul>\n";
        }
        
        public function endLogEventsList() {
-               return Xml::closeElement( $this->getWrapperElement() ) . "\n";
+               return "</ul>\n";
        }
        
                /**
@@ -260,24 +254,8 @@ class LogEventsList {
                } else {
                        $action = LogPage::actionText( $row->log_type, $row->log_action, $title, $this->skin, $paramArray, true );
                }
-
-               global $wgDateGroupedLogs;
-               if ( $wgDateGroupedLogs ) {
-                       $time = $wgLang->time( wfTimestamp(TS_MW, $row->log_timestamp), true );
-                       $date = $wgLang->date( wfTimestamp(TS_MW, $row->log_timestamp), true );
-                       $line = Xml::tags('div', array( 'class' => 'mw-log-entry' ), "$del$time $userLink $action $comment $revert" );
-
-                       static $lastdate = false;
-                       if ( $date !== $lastdate ) {
-                               $lastdate = $date;
-                               return Xml::element('h4', null, $date) . "\n" . $line;
-                       } else {
-                               return $line;
-                       }
-               } else {
-                       return Xml::tags('li', null, "$del$time $userLink $action $comment $revert" );
-               }
-
+               
+               return "<li>$del$time $userLink $action $comment $revert</li>\n";
        }
        
        /**