Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Comments #9658

Merged
merged 5 commits into from
Jan 10, 2017
Merged

Comments #9658

merged 5 commits into from
Jan 10, 2017

Conversation

eileenmcnaughton
Copy link
Contributor

No description provided.

@@ -134,7 +134,7 @@ public function postProcess() {
// Get the permissions into a format that matches what we get from WP
$allWarningPermissions = CRM_Core_Permission::getAnonymousPermissionsWarnings();
foreach ($allWarningPermissions as $key => $permission) {
$allWarningPermissions[$key] = CRM_utils_String::munge(strtolower($permission));
$allWarningPermissions[$key] = CRM_Utils_String::munge(strtolower($permission));
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix casing to be correct

@@ -341,7 +341,7 @@ public static function formRule($fields, $files, $self) {
return TRUE;
}

return parent::formrule($fields, $files, $self);
return parent::formRule($fields, $files, $self);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix casing to be correct

@@ -41,7 +41,7 @@ class CRM_Case_Form_Task_Print extends CRM_Case_Form_Task {
* Build all the data structures needed to build the form.
*/
public function preProcess() {
parent::preprocess();
parent::preProcess();
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix casing to be correct

@@ -206,11 +235,12 @@ public static function getExports($dao, $labelName, $prefix, $foreignDAOs) {
$exports = array();
$fields = $dao::fields();

foreach($fields as $name => $field) {
foreach ($fields as $name => $field) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

whitespace - this file is probably ignored as it used to be autogenerated

@@ -816,7 +816,7 @@ public function changeSubscriptionAmount(&$message = '', $params = array()) {

curl_close($submit);

$responseFields = $this->_ParseArbReturn($response);
$responseFields = $this->_parseArbReturn($response);
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fix casing to be correct

@@ -1,10 +1,12 @@
<?php

/**
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

template for civicrm.version.php

@@ -36,7 +36,14 @@
*/
class CRM_Core_I18n_SchemaStructure
{ldelim}
static function &columns()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

template for SchemaStructure

* @return array
* A table-indexed array of translatable columns.
*/
public static function &columns()
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I desperately want to remove the & too but not mixing it in

* @return array
*/
public static function mailingGroupEntityTables($context = NULL) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would check with @totten on this one

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actually it looks like it was @colemanw who edited that fn so the var is not removed without removing it - any reason C?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see. The function works kind of like a hook, in that the caller will pass in that variable whenever calling a *EntityTables function whether it's needed or not. In this case it's not needed. Fine to remove it or document it.

public function setDefaultValues() {
$dafaults = array();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ha

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Funny thing is that php won't care. Unless of course the two conditionals below are false. I guess one or the other is always true or else people would have noticed an undefined var notice.

Copy link
Contributor

@seamuslee001 seamuslee001 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good apart from the one in the mailing

@eileenmcnaughton eileenmcnaughton merged commit c1cc524 into civicrm:master Jan 10, 2017
@eileenmcnaughton eileenmcnaughton deleted the comments branch January 10, 2017 03:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants