Merge "Handle comment truncation in CommentStore"

diff --cc includes/CommentStore.php
Simple merge

diff --cc includes/EditPage.php
Simple merge

diff --cc includes/Revision.php
Simple merge

diff --cc includes/changes/RecentChange.php
index cd11070,e62d2e7..1992223
--- 1/includes/changes/RecentChange.php
--- 2/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@@ -315,11 -315,9 +315,8 @@@ class RecentChange 
                # Trim spaces on user supplied text
                $this->mAttribs['rc_comment'] = trim( $this->mAttribs['rc_comment'] );
  
-               # Make sure summary is truncated (whole multibyte characters)
-               $this->mAttribs['rc_comment'] = $wgContLang->truncate( $this->mAttribs['rc_comment'], 255 );
- 
                # Fixup database timestamps
                $this->mAttribs['rc_timestamp'] = $dbw->timestamp( $this->mAttribs['rc_timestamp'] );
 -              $this->mAttribs['rc_id'] = $dbw->nextSequenceValue( 'recentchanges_rc_id_seq' );
  
                # # If we are using foreign keys, an entry of 0 for the page_id will fail, so use NULL
                if ( $this->mAttribs['rc_cur_id'] == 0 ) {

diff --cc includes/filerepo/file/LocalFile.php
Simple merge

diff --cc includes/logging/LogEntry.php
index 6197d40,75617d9..8b51932
--- 1/includes/logging/LogEntry.php
--- 2/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@@ -593,9 -593,8 +593,7 @@@ class ManualLogEntry extends LogEntryBa
         * @throws MWException
         */
        public function insert( IDatabase $dbw = null ) {
-               global $wgContLang;
- 
                $dbw = $dbw ?: wfGetDB( DB_MASTER );
 -              $id = $dbw->nextSequenceValue( 'logging_log_id_seq' );
  
                if ( $this->timestamp === null ) {
                        $this->timestamp = wfTimestampNow();

diff --cc includes/logging/LogPage.php
Simple merge

diff --cc includes/page/WikiPage.php
Simple merge

diff --cc tests/phpunit/includes/CommentStoreTest.php
Simple merge