Completed
Push — develop ( 0af8fe...beada1 )
by Greg
08:23
created
app/Database.php 1 patch
Spacing   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -85,8 +85,7 @@
 block discarded – undo
85 85
 		// Create the underlying PDO object
86 86
 		self::$pdo = new PDO(
87 87
 			(substr($DBHOST, 0, 1) === '/' ?
88
-				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" :
89
-				"mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
88
+				"mysql:unix_socket={$DBHOST};dbname={$DBNAME}" : "mysql:host={$DBHOST};dbname={$DBNAME};port={$DBPORT}"
90 89
 			),
91 90
 			$DBUSER, $DBPASS,
92 91
 			[
Please login to merge, or discard this patch.
app/Theme/AbstractTheme.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -819,7 +819,7 @@  discard block
 block discarded – undo
819 819
 				'<div class="icons">' .
820 820
 				'<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
821 821
 				'<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
822
-				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function(Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
822
+				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function (Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
823 823
 				'</div>' .
824 824
 				'</div>' .
825 825
 				'</div>';
@@ -871,7 +871,7 @@  discard block
 block discarded – undo
871 871
 				'<div class="icons">' .
872 872
 				'<span class="iconz icon-zoomin" title="' . I18N::translate('Zoom in/out on this box.') . '"></span>' .
873 873
 				'<div class="itr"><i class="icon-pedigree"></i><div class="popup">' .
874
-				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function(Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
874
+				'<ul class="' . $personBoxClass . '">' . implode('', array_map(function (Menu $menu) { return $menu->bootstrap4(); }, $this->individualBoxMenu($individual))) . '</ul>' .
875 875
 				'</div>' .
876 876
 				'</div>' .
877 877
 				'</div>';
Please login to merge, or discard this patch.
app/Family.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -343,7 +343,7 @@  discard block
 block discarded – undo
343 343
 			// Check the script used by each name, so we can match cyrillic with cyrillic, greek with greek, etc.
344 344
 			$husb_names = [];
345 345
 			if ($this->husb) {
346
-				$husb_names = array_filter($this->husb->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
346
+				$husb_names = array_filter($this->husb->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } );
347 347
 			}
348 348
 			// If the individual only has married names, create a dummy birth name.
349 349
 			if (empty($husb_names)) {
@@ -359,7 +359,7 @@  discard block
 block discarded – undo
359 359
 
360 360
 			$wife_names = [];
361 361
 			if ($this->wife) {
362
-				$wife_names = array_filter($this->wife->getAllNames(), function(array $x) { return $x['type'] !== '_MARNM'; } );
362
+				$wife_names = array_filter($this->wife->getAllNames(), function (array $x) { return $x['type'] !== '_MARNM'; } );
363 363
 			}
364 364
 			// If the individual only has married names, create a dummy birth name.
365 365
 			if (empty($wife_names)) {
Please login to merge, or discard this patch.
app/Theme/CloudsTheme.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -106,7 +106,7 @@
 block discarded – undo
106 106
 			if (!empty($menu->getSubmenus())) {
107 107
 				// Insert a dummy menu / label into the submenu
108 108
 				$submenus = $menu->getSubmenus();
109
-				array_unshift($submenus, new Menu($menu->getLabel(), null, null, [ 'onclick' => 'return false;']));
109
+				array_unshift($submenus, new Menu($menu->getLabel(), null, null, ['onclick' => 'return false;']));
110 110
 				$menu->setSubmenus($submenus);
111 111
 			}
112 112
 
Please login to merge, or discard this patch.
app/Functions/FunctionsEdit.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -647,7 +647,7 @@  discard block
 block discarded – undo
647 647
 		} elseif ($fact === 'REPO') {
648 648
 			echo
649 649
 				'<div class="input-group">' .
650
-				'<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#modal-create-repository" data-element-id="' . $element_id . '" title="' . I18N::translate('Create a repository') . '"><i class="fa fa-plus"></i></button></span>' .				self::formControlRepository(Individual::getInstance($value, $WT_TREE), ['id' => $element_id, 'name' => $element_name]) .
650
+				'<span class="input-group-btn"><button class="btn btn-secondary" type="button" data-toggle="modal" data-target="#modal-create-repository" data-element-id="' . $element_id . '" title="' . I18N::translate('Create a repository') . '"><i class="fa fa-plus"></i></button></span>' . self::formControlRepository(Individual::getInstance($value, $WT_TREE), ['id' => $element_id, 'name' => $element_name]) .
651 651
 				'</div>';
652 652
 		} elseif ($fact === 'RESN') {
653 653
 			echo Bootstrap4::select(FunctionsEdit::optionsRestrictions(true), $value, ['id' => $element_id, 'name' => $element_name]);
@@ -775,7 +775,7 @@  discard block
 block discarded – undo
775 775
 		} elseif ($fact === 'TYPE' && $level === 0) {
776 776
 			// NAME TYPE : hide text field and show a selection list
777 777
 			echo Bootstrap4::select(GedcomCodeName::getValues($person), $value, ['id' => $element_id, 'name' => $element_name, 'onchange' => 'onchange="document.getElementById(\'' . $element_id . '\').value=this.value;"']);
778
-			echo '<script>document.getElementById("', $element_id, '").style.display="none";</script>';		}
778
+			echo '<script>document.getElementById("', $element_id, '").style.display="none";</script>'; }
779 779
 
780 780
 		// popup links
781 781
 		switch ($fact) {
Please login to merge, or discard this patch.
app/Controller/FamilyController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -85,7 +85,7 @@
 block discarded – undo
85 85
 
86 86
 			// edit_fam / reorder_children
87 87
 			if ($this->record->getNumberOfChildren() > 1) {
88
-				$menu->addSubmenu(new Menu(I18N::translate('Re-order children'), 'edit_interface.php?action=reorder_children&amp;ged=' . $this->record->getTree()->getNameHtml() .'&amp;xref=' . $this->record->getXref(), 'menu-fam-orderchil'));
88
+				$menu->addSubmenu(new Menu(I18N::translate('Re-order children'), 'edit_interface.php?action=reorder_children&amp;ged=' . $this->record->getTree()->getNameHtml() . '&amp;xref=' . $this->record->getXref(), 'menu-fam-orderchil'));
89 89
 			}
90 90
 
91 91
 			// delete
Please login to merge, or discard this patch.