Glaisher has uploaded a new change for review.
https://gerrit.wikimedia.org/r/252712
Change subject: Change nl_desc to a blob
......................................................................
Change nl_desc to a blob
And truncate description field when shown on Special:Newsletters
Change-Id: I316ad606a04f981a6a7b0420f8e3b83f366cf70f
---
M includes/specials/SpecialNewsletterCreate.php
M includes/specials/pagers/NewsletterTablePager.php
M sql/nl_newsletters.sql
3 files changed, 4 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Newsletter
refs/changes/12/252712/1
diff --git a/includes/specials/SpecialNewsletterCreate.php
b/includes/specials/SpecialNewsletterCreate.php
index ea185bb..f56cd0f 100644
--- a/includes/specials/SpecialNewsletterCreate.php
+++ b/includes/specials/SpecialNewsletterCreate.php
@@ -42,7 +42,6 @@
'required' => true,
'label-message' => 'newsletter-desc',
'rows' => 15,
- 'maxlength' => 767
),
'mainpage' => array(
'type' => 'title',
diff --git a/includes/specials/pagers/NewsletterTablePager.php
b/includes/specials/pagers/NewsletterTablePager.php
index 43dde77..5dd78db 100644
--- a/includes/specials/pagers/NewsletterTablePager.php
+++ b/includes/specials/pagers/NewsletterTablePager.php
@@ -58,6 +58,8 @@
}
public function formatValue( $field, $value ) {
+ global $wgContLang;
+
$id = $this->mCurrentRow->nl_id;
switch ( $field ) {
case 'nl_name':
@@ -68,7 +70,7 @@
return htmlspecialchars( $value );
}
case 'nl_desc':
- return htmlspecialchars( $value );
+ return $wgContLang->truncate( htmlspecialchars(
$value ), 644 );
case 'subscriber_count':
return HTML::element(
'span',
diff --git a/sql/nl_newsletters.sql b/sql/nl_newsletters.sql
index 0c3f744..c07b7b9 100644
--- a/sql/nl_newsletters.sql
+++ b/sql/nl_newsletters.sql
@@ -4,7 +4,7 @@
-- Primary key
nl_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
nl_name varchar(64) NOT NULL,
- nl_desc varbinary(1024),
+ nl_desc blob,
nl_main_page_id int unsigned NOT NULL UNIQUE
)/*$wgDBTableOptions*/;
--
To view, visit https://gerrit.wikimedia.org/r/252712
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I316ad606a04f981a6a7b0420f8e3b83f366cf70f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Newsletter
Gerrit-Branch: master
Gerrit-Owner: Glaisher <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
