[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Fix var_dump() and undefined var warning.

2016-10-10 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Fix var_dump() and undefined var warning.
..


Fix var_dump() and undefined var warning.

Change-Id: Iddb4d3bb8dfd42007ead37cf609f421ffb7067b8
---
M includes/content/CollaborationListContent.php
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Brian Wolff: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 33d32aa..824328d 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -147,7 +147,9 @@
if ( !$lang ) {
$lang = $title->getPageLanguage();
}
-   $listOptions = $this->getFullRenderListOptions() + 
(array)$this->options;
+   $listOptions = $this->getFullRenderListOptions()
+   + (array)$this->options
+   + $this->getDefaultOptions();
$text = $this->convertToWikitext( $lang, $listOptions );
$output = $wgParser->parse( $text, $title, $options, true, 
true, $revId );
$output->addJsConfigVars( 'wgCollaborationKitIsMemberList', 
$listOptions['ismemberlist'] );
@@ -235,7 +237,6 @@
// you also need to change it in the 
stylesheet.
$text .= '[[File:' . $image->getName() 
. "|left|64px|alt=]]\n";
} else {
-var_dump( $options );
if ( $options['ismemberlist'] ) {
$placeholderIcon = 
'mw-ckicon-user-grey2';
} else {

-- 
To view, visit https://gerrit.wikimedia.org/r/315127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iddb4d3bb8dfd42007ead37cf609f421ffb7067b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 
Gerrit-Reviewer: Brian Wolff 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...CollaborationKit[master]: Fix var_dump() and undefined var warning.

2016-10-10 Thread Brian Wolff (Code Review) 
Brian Wolff has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/315127

Change subject: Fix var_dump() and undefined var warning.
..

Fix var_dump() and undefined var warning.

Change-Id: Iddb4d3bb8dfd42007ead37cf609f421ffb7067b8
---
M includes/content/CollaborationListContent.php
1 file changed, 3 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CollaborationKit 
refs/changes/27/315127/1

diff --git a/includes/content/CollaborationListContent.php 
b/includes/content/CollaborationListContent.php
index 33d32aa..824328d 100644
--- a/includes/content/CollaborationListContent.php
+++ b/includes/content/CollaborationListContent.php
@@ -147,7 +147,9 @@
if ( !$lang ) {
$lang = $title->getPageLanguage();
}
-   $listOptions = $this->getFullRenderListOptions() + 
(array)$this->options;
+   $listOptions = $this->getFullRenderListOptions()
+   + (array)$this->options
+   + $this->getDefaultOptions();
$text = $this->convertToWikitext( $lang, $listOptions );
$output = $wgParser->parse( $text, $title, $options, true, 
true, $revId );
$output->addJsConfigVars( 'wgCollaborationKitIsMemberList', 
$listOptions['ismemberlist'] );
@@ -235,7 +237,6 @@
// you also need to change it in the 
stylesheet.
$text .= '[[File:' . $image->getName() 
. "|left|64px|alt=]]\n";
} else {
-var_dump( $options );
if ( $options['ismemberlist'] ) {
$placeholderIcon = 
'mw-ckicon-user-grey2';
} else {

-- 
To view, visit https://gerrit.wikimedia.org/r/315127
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iddb4d3bb8dfd42007ead37cf609f421ffb7067b8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CollaborationKit
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits