Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/114376
Change subject: fix warnings
......................................................................
fix warnings
Change-Id: I43494c5422472a2c88c9a1cfd321c03a6cc69a56
---
M CRM/Contribute/Form/Task.php
M CRM/Core/Block.php
M packages/HTML/QuickForm.php
M packages/HTML/QuickForm/RuleRegistry.php
M packages/HTML/QuickForm/advcheckbox.php
5 files changed, 7 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm
refs/changes/76/114376/1
diff --git a/CRM/Contribute/Form/Task.php b/CRM/Contribute/Form/Task.php
index 2402329..9c55876 100644
--- a/CRM/Contribute/Form/Task.php
+++ b/CRM/Contribute/Form/Task.php
@@ -166,7 +166,7 @@
* @return void
* @access public
*/
- function addDefaultButtons($title, $nextType = 'next', $backType = 'back') {
+ function addDefaultButtons($title, $nextType = 'next', $backType = 'back',
$submitOnce = FALSE) {
$this->addButtons(array(
array(
'type' => $nextType,
diff --git a/CRM/Core/Block.php b/CRM/Core/Block.php
index 19fd5b0..45d3d3c 100644
--- a/CRM/Core/Block.php
+++ b/CRM/Core/Block.php
@@ -281,6 +281,7 @@
* @return void
* @access private
*/
+ static
private function setTemplateValues($id) {
switch ($id) {
case self::CREATE_NEW:
@@ -333,6 +334,7 @@
* @return void
* @access private
*/
+ static
private function setTemplateShortcutValues() {
$config = CRM_Core_Config::singleton();
@@ -433,6 +435,7 @@
* @return void
* @access private
*/
+ static
private function setTemplateDashboardValues() {
static $dashboardLinks = array();
if (CRM_Core_Permission::check('access Contact Dashboard')) {
diff --git a/packages/HTML/QuickForm.php b/packages/HTML/QuickForm.php
index 0125125..981bcfe 100644
--- a/packages/HTML/QuickForm.php
+++ b/packages/HTML/QuickForm.php
@@ -1320,6 +1320,7 @@
* @param array $b array which will be merged into first one
* @return array merged array
*/
+ static
function arrayMerge($a, $b)
{
foreach ($b as $k => $v) {
diff --git a/packages/HTML/QuickForm/RuleRegistry.php
b/packages/HTML/QuickForm/RuleRegistry.php
index 4873188..8ec1abc 100644
--- a/packages/HTML/QuickForm/RuleRegistry.php
+++ b/packages/HTML/QuickForm/RuleRegistry.php
@@ -54,7 +54,7 @@
* @static
* @return HTML_QuickForm_RuleRegistry
*/
- function &singleton()
+ static function &singleton()
{
static $obj;
if (!isset($obj)) {
diff --git a/packages/HTML/QuickForm/advcheckbox.php
b/packages/HTML/QuickForm/advcheckbox.php
index 19e2255..d9ce0f5 100644
--- a/packages/HTML/QuickForm/advcheckbox.php
+++ b/packages/HTML/QuickForm/advcheckbox.php
@@ -271,7 +271,7 @@
* This element has a value even if it is not checked, thus we override
* checkbox's behaviour here
*/
- function exportValue(&$submitValues, $assoc)
+ function exportValue(&$submitValues, $assoc = false)
{
$value = $this->_findValue($submitValues);
if (null === $value) {
--
To view, visit https://gerrit.wikimedia.org/r/114376
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I43494c5422472a2c88c9a1cfd321c03a6cc69a56
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Adamw <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits