From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 5 Sep 2017 18:39:21 +0000 (+0000)
Subject: Merge "Handle comment truncation in CommentStore"
X-Git-Tag: 1.31.0-rc.0~2210
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=a17d459d4bfa29f56181f0be1e407336574d9361;p=lhc%2Fweb%2Fwiklou.git

Merge "Handle comment truncation in CommentStore"
---

a17d459d4bfa29f56181f0be1e407336574d9361
diff --cc includes/changes/RecentChange.php
index cd11070002,e62d2e7b32..199222307c
--- a/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/logging/LogEntry.php
index 6197d407df,75617d9a0d..8b51932be7
--- a/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();