summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2015-03-02 13:53:46 +0000
committerGreg Roach <fisharebest@gmail.com>2015-03-02 13:53:46 +0000
commit841014f17832a30761bc213858413d11cbeca0b7 (patch)
treeb1c24a33284522e228a9a3b9f24fc98554125c4a /app
parent36a0c51dbeead9dbab09a651995a352aaebfe960 (diff)
downloadwebtrees-841014f17832a30761bc213858413d11cbeca0b7.tar.gz
webtrees-841014f17832a30761bc213858413d11cbeca0b7.tar.bz2
webtrees-841014f17832a30761bc213858413d11cbeca0b7.zip
PSR-1
Diffstat (limited to 'app')
-rw-r--r--app/Family.php4
-rw-r--r--app/GedcomRecord.php4
-rw-r--r--app/Individual.php4
-rw-r--r--app/Stats.php18
4 files changed, 15 insertions, 15 deletions
diff --git a/app/Family.php b/app/Family.php
index 2fcf2f32c0..36c3a272d3 100644
--- a/app/Family.php
+++ b/app/Family.php
@@ -379,7 +379,7 @@ class Family extends GedcomRecord {
/** {@inheritdoc} */
function formatListDetails() {
return
- $this->format_first_major_fact(WT_EVENTS_MARR, 1) .
- $this->format_first_major_fact(WT_EVENTS_DIV, 1);
+ $this->formatFirstMajorFact(WT_EVENTS_MARR, 1) .
+ $this->formatFirstMajorFact(WT_EVENTS_DIV, 1);
}
}
diff --git a/app/GedcomRecord.php b/app/GedcomRecord.php
index 5d088db1ea..2bf583281d 100644
--- a/app/GedcomRecord.php
+++ b/app/GedcomRecord.php
@@ -742,7 +742,7 @@ class GedcomRecord {
*
* @return string
*/
- public function format_list($tag = 'li', $find = false, $name = null) {
+ public function formatList($tag = 'li', $find = false, $name = null) {
if (is_null($name)) {
$name = $this->getFullName();
}
@@ -774,7 +774,7 @@ class GedcomRecord {
*
* @return string
*/
- public function format_first_major_fact($facts, $style) {
+ public function formatFirstMajorFact($facts, $style) {
foreach ($this->getFacts($facts, true) as $event) {
// Only display if it has a date or place (or both)
if ($event->getDate()->isOK() || !$event->getPlace()->isEmpty()) {
diff --git a/app/Individual.php b/app/Individual.php
index e2ae8116f2..73c8071a2e 100644
--- a/app/Individual.php
+++ b/app/Individual.php
@@ -1255,8 +1255,8 @@ class Individual extends GedcomRecord {
*/
function formatListDetails() {
return
- $this->format_first_major_fact(WT_EVENTS_BIRT, 1) .
- $this->format_first_major_fact(WT_EVENTS_DEAT, 1);
+ $this->formatFirstMajorFact(WT_EVENTS_BIRT, 1) .
+ $this->formatFirstMajorFact(WT_EVENTS_DEAT, 1);
}
/**
diff --git a/app/Stats.php b/app/Stats.php
index 96f82d3aac..07a427f7fc 100644
--- a/app/Stats.php
+++ b/app/Stats.php
@@ -1273,7 +1273,7 @@ class Stats {
default:
case 'full':
if ($record->canShow()) {
- $result = $record->format_list('span', false, $record->getFullName());
+ $result = $record->formatList('span', false, $record->getFullName());
} else {
$result = I18N::translate('This information is private and cannot be shown.');
}
@@ -2031,7 +2031,7 @@ class Stats {
default:
case 'full':
if ($person->canShowName()) {
- $result = $person->format_list('span', false, $person->getFullName());
+ $result = $person->formatList('span', false, $person->getFullName());
} else {
$result = I18N::translate('This information is private and cannot be shown.');
}
@@ -2651,7 +2651,7 @@ class Stats {
default:
case 'full':
if ($record->canShow()) {
- $result = $record->format_list('span', false, $record->getFullName());
+ $result = $record->formatList('span', false, $record->getFullName());
} else {
$result = I18N::translate('This information is private and cannot be shown.');
}
@@ -2804,7 +2804,7 @@ class Stats {
default:
case 'full':
if ($family->canShow()) {
- $result = $family->format_list('span', false, $person->getFullName());
+ $result = $family->formatList('span', false, $person->getFullName());
} else {
$result = I18N::translate('This information is private and cannot be shown.');
}
@@ -2921,7 +2921,7 @@ class Stats {
foreach ($rows as $fam => $age) {
$family = Family::getInstance($fam, $this->tree->getTreeId());
if ($type === 'name') {
- return $family->format_list('span', false, $family->getFullName());
+ return $family->formatList('span', false, $family->getFullName());
}
if ((int) ($age / 365.25) > 0) {
$age = (int) ($age / 365.25) . 'y';
@@ -3094,7 +3094,7 @@ class Stats {
default:
case 'full':
if ($person->canShow()) {
- $result = $person->format_list('span', false, $person->getFullName());
+ $result = $person->formatList('span', false, $person->getFullName());
} else {
$result = I18N::translate('This information is private and cannot be shown.');
}
@@ -3948,7 +3948,7 @@ class Stats {
default:
case 'full':
if ($family->canShow()) {
- $result = $family->format_list('span', false, $family->getFullName());
+ $result = $family->formatList('span', false, $family->getFullName());
} else {
$result = I18N::translate('This information is private and cannot be shown.');
}
@@ -4117,9 +4117,9 @@ class Stats {
}
} else {
if ($child1->canShow() && $child2->canShow()) {
- $return = $child2->format_list('span', false, $child2->getFullName());
+ $return = $child2->formatList('span', false, $child2->getFullName());
$return .= "<br>" . I18N::translate('and') . "<br>";
- $return .= $child1->format_list('span', false, $child1->getFullName());
+ $return .= $child1->formatList('span', false, $child1->getFullName());
$return .= "<br><a href=\"" . $family->getHtmlUrl() . "\">[" . I18N::translate('View family') . "]</a>";
return $return;
} else {