Completed
Push — 1.7 ( 2a412f...f51b0f )
by Greg
07:13
created
admin_trees_config.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -551,18 +551,24 @@
 block discarded – undo
551 551
                     <div class="bg-danger text-danger">
552 552
                         <?php echo $resn->xref, ' — ', I18N::translate('this record does not exist'); ?>
553 553
                     </div>
554
-                    <?php else: ?>
554
+                    <?php else {
555
+    : ?>
555 556
                     <div class="text-muted">
556
-                        <?php echo I18N::translate('All records'); ?>
557
+                        <?php echo I18N::translate('All records');
558
+}
559
+?>
557 560
                     </div>
558 561
                     <?php endif; ?>
559 562
                 </td>
560 563
                 <td>
561 564
                     <?php if ($resn->tag_label): ?>
562 565
                         <?php echo $resn->tag_label; ?>
563
-                    <?php else: ?>
566
+                    <?php else {
567
+    : ?>
564 568
                     <div class="text-muted">
565
-                        <?php echo I18N::translate('All facts and events'); ?>
569
+                        <?php echo I18N::translate('All facts and events');
570
+}
571
+?>
566 572
                     </div>
567 573
                     <?php endif; ?>
568 574
                 </td>
Please login to merge, or discard this patch.
admin_module_menus.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -98,8 +98,11 @@
 block discarded – undo
98 98
                 <td class="col-xs-1">
99 99
                     <?php if ($module instanceof ModuleConfigInterface): ?>
100 100
                     <a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
101
-                    <?php else: ?>
102
-                    <?php echo $module->getTitle(); ?>
101
+                    <?php else {
102
+    : ?>
103
+                    <?php echo $module->getTitle();
104
+}
105
+?>
103 106
                     <?php endif; ?>
104 107
                 </td>
105 108
                 <td class="col-xs-5"><?php echo $module->getDescription(); ?></td>
Please login to merge, or discard this patch.
admin.php 1 patch
Braces   +35 added lines, -14 removed lines patch added patch discarded remove patch
@@ -625,8 +625,11 @@  discard block
 block discarded – undo
625 625
                     <a href="admin_site_upgrade.php" class="error">
626 626
                         <?php echo /* I18N: %s is a version number */ I18N::translate('Upgrade to webtrees %s.', Filter::escapeHtml($latest_version)); ?>
627 627
                     </a>
628
-                    <?php else: ?>
629
-                        <?php echo I18N::translate('This is the latest version of webtrees. No upgrade is available.'); ?>
628
+                    <?php else {
629
+    : ?>
630
+                        <?php echo I18N::translate('This is the latest version of webtrees. No upgrade is available.');
631
+}
632
+?>
630 633
                     <?php endif; ?>
631 634
                 </p>
632 635
                 <?php endif; ?>
@@ -788,9 +791,12 @@  discard block
 block discarded – undo
788 791
                                     <?php echo I18N::number($changes[$tree->getTreeId()]); ?>
789 792
                                     <span class="sr-only"><?php echo I18N::translate('Pending changes'); ?> <?php echo $tree->getTitleHtml(); ?></span>
790 793
                                 </a>
791
-                                <?php else: ?>
794
+                                <?php else {
795
+    : ?>
792 796
                                 -
793
-                                <?php endif; ?>
797
+                                <?php endif;
798
+}
799
+?>
794 800
                             </td>
795 801
                             <td class="text-right flip">
796 802
                                 <?php if ($individuals[$tree->getTreeId()]): ?>
@@ -798,9 +804,12 @@  discard block
 block discarded – undo
798 804
                                     <?php echo I18N::number($individuals[$tree->getTreeId()]); ?>
799 805
                                     <span class="sr-only"><?php echo I18N::translate('Individuals'); ?> <?php echo $tree->getTitleHtml(); ?></span>
800 806
                                 </a>
801
-                                <?php else: ?>
807
+                                <?php else {
808
+    : ?>
802 809
                                     -
803
-                                <?php endif; ?>
810
+                                <?php endif;
811
+}
812
+?>
804 813
                                 </td>
805 814
                             <td class="text-right flip">
806 815
                                 <?php if ($families[$tree->getTreeId()]): ?>
@@ -808,9 +817,12 @@  discard block
 block discarded – undo
808 817
                                     <?php echo I18N::number($families[$tree->getTreeId()]); ?>
809 818
                                     <span class="sr-only"><?php echo I18N::translate('Families'); ?> <?php echo $tree->getTitleHtml(); ?></span>
810 819
                                 </a>
811
-                                <?php else: ?>
820
+                                <?php else {
821
+    : ?>
812 822
                                 -
813
-                                <?php endif; ?>
823
+                                <?php endif;
824
+}
825
+?>
814 826
                                 </td>
815 827
                             <td class="text-right flip">
816 828
                                 <?php if ($sources[$tree->getTreeId()]): ?>
@@ -818,9 +830,12 @@  discard block
 block discarded – undo
818 830
                                     <?php echo I18N::number($sources[$tree->getTreeId()]); ?>
819 831
                                     <span class="sr-only"><?php echo I18N::translate('Sources'); ?> <?php echo $tree->getTitleHtml(); ?></span>
820 832
                                 </a>
821
-                                <?php else: ?>
833
+                                <?php else {
834
+    : ?>
822 835
                                 -
823
-                                <?php endif; ?>
836
+                                <?php endif;
837
+}
838
+?>
824 839
                             </td>
825 840
                             <td class="text-right flip">
826 841
                                 <?php if ($repositories[$tree->getTreeId()]): ?>
@@ -828,9 +843,12 @@  discard block
 block discarded – undo
828 843
                                     <?php echo I18N::number($repositories[$tree->getTreeId()]); ?>
829 844
                                     <span class="sr-only"><?php echo I18N::translate('Repositories'); ?> <?php echo $tree->getTitleHtml(); ?></span>
830 845
                                 </a>
831
-                                <?php else: ?>
846
+                                <?php else {
847
+    : ?>
832 848
                                     -
833
-                                <?php endif; ?>
849
+                                <?php endif;
850
+}
851
+?>
834 852
                             </td>
835 853
                             <td class="text-right flip">
836 854
                                 <?php if ($media[$tree->getTreeId()]): ?>
@@ -838,9 +856,12 @@  discard block
 block discarded – undo
838 856
                                     <?php echo I18N::number($media[$tree->getTreeId()]); ?>
839 857
                                     <span class="sr-only"><?php echo I18N::translate('Media objects'); ?> <?php echo $tree->getTitleHtml(); ?></span>
840 858
                                 </a>
841
-                                <?php else: ?>
859
+                                <?php else {
860
+    : ?>
842 861
                                 -
843
-                                <?php endif; ?>
862
+                                <?php endif;
863
+}
864
+?>
844 865
                             </td>
845 866
                         </tr>
846 867
                         <?php endforeach; ?>
Please login to merge, or discard this patch.
admin_module_blocks.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -81,8 +81,11 @@
 block discarded – undo
81 81
                 <td class="col-xs-2">
82 82
                     <?php if ($module instanceof ModuleConfigInterface): ?>
83 83
                         <a href="<?php echo $module->getConfigLink(); ?>"><?php echo $module->getTitle(); ?> <i class="fa fa-cogs"></i></a>
84
-                    <?php else: ?>
85
-                        <?php echo $module->getTitle(); ?>
84
+                    <?php else {
85
+    : ?>
86
+                        <?php echo $module->getTitle();
87
+}
88
+?>
86 89
                     <?php endif; ?>
87 90
                 </td>
88 91
                 <td class="col-xs-5"><?php echo $module->getDescription(); ?></td>
Please login to merge, or discard this patch.
app/Module/FamilyNavigatorModule.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -147,8 +147,11 @@  discard block
 block discarded – undo
147 147
                     <div class="font9">
148 148
                         <?php echo $spouse->getLifeSpan(); ?>
149 149
                     </div>
150
-                    <?php else: ?>
151
-                        <?php echo $spouse->getFullName(); ?>
150
+                    <?php else {
151
+    : ?>
152
+                        <?php echo $spouse->getFullName();
153
+}
154
+?>
152 155
                     <?php endif; ?>
153 156
                 </td>
154 157
             </tr>
@@ -172,8 +175,11 @@  discard block
 block discarded – undo
172 175
                     <div class="font9">
173 176
                         <?php echo $child->getLifeSpan(); ?>
174 177
                     </div>
175
-                    <?php else: ?>
176
-                        <?php echo $child->getFullName(); ?>
178
+                    <?php else {
179
+    : ?>
180
+                        <?php echo $child->getFullName();
181
+}
182
+?>
177 183
                     <?php endif; ?>
178 184
                 </td>
179 185
             </tr>
Please login to merge, or discard this patch.
app/Module/BatchUpdateModule.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -241,12 +241,15 @@  discard block
 block discarded – undo
241 241
                     <?php // Reset - otherwise we might "undo all changes", which refreshes the ?>
242 242
                     <?php // page, which makes them all again!  ?>
243 243
                     <script>reset_reload();</script>
244
-            <?php else: ?>
244
+            <?php else {
245
+    : ?>
245 246
                     <hr>
246 247
                     <div id="batch_update2" class="col-sm-12">
247 248
                         <?php if ($this->curr_xref): ?>
248 249
                             <?php // Create an object, so we can get the latest version of the name. ?>
249
-                                <?php $this->record = GedcomRecord::getInstance($this->curr_xref, $WT_TREE); ?>
250
+                                <?php $this->record = GedcomRecord::getInstance($this->curr_xref, $WT_TREE);
251
+}
252
+?>
250 253
                             <div class="form-group">
251 254
                                 <?php echo self::createSubmitButton(I18N::translate('previous'), $this->prev_xref) ?>
252 255
                             <?php echo self::createSubmitButton(I18N::translate('next'), $this->next_xref) ?>
@@ -258,8 +261,11 @@  discard block
 block discarded – undo
258 261
                             <div class="form-group">
259 262
                             <?php echo implode(' ', $this->PLUGIN->getActionButtons($this->curr_xref, $this->record)); ?>
260 263
                             </div>
261
-                        <?php else: ?>
262
-                            <div class="alert alert-info"><?php echo I18N::translate('Nothing found.'); ?></div>
264
+                        <?php else {
265
+    : ?>
266
+                            <div class="alert alert-info"><?php echo I18N::translate('Nothing found.');
267
+}
268
+?></div>
263 269
                     <?php endif; ?>
264 270
                     </div>
265 271
                 <?php endif; ?>
Please login to merge, or discard this patch.
app/Module/StoriesModule.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -403,8 +403,11 @@
 block discarded – undo
403 403
                         <a href="<?php echo $individual->getHtmlUrl(); ?>#stories">
404 404
                             <?php echo $individual->getFullName(); ?>
405 405
                         </a>
406
-                        <?php else: ?>
407
-                            <?php echo $story->xref; ?>
406
+                        <?php else {
407
+    : ?>
408
+                            <?php echo $story->xref;
409
+}
410
+?>
408 411
                         <?php endif; ?>
409 412
                         </td>
410 413
                         <td>
Please login to merge, or discard this patch.
medialist.php 1 patch
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -110,10 +110,13 @@
 block discarded – undo
110 110
                         </option>
111 111
                     </select>
112 112
                 </td>
113
-                <?php else: ?>
113
+                <?php else {
114
+    : ?>
114 115
                     <td class="descriptionbox wrap"></td>
115 116
                     <td class="optionbox wrap"></td>
116
-                <?php endif; ?>
117
+                <?php endif;
118
+}
119
+?>
117 120
             </tr>
118 121
             <tr>
119 122
                 <td class="descriptionbox wrap">
Please login to merge, or discard this patch.
modules_v3/GEDFact_assistant/MEDIA_ctrl.php 1 patch
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -131,7 +131,8 @@
 block discarded – undo
131 131
  * @param Family     $family
132 132
  * @param Individual $individual
133 133
  */
134
-function print_navigator_family(Family $family, Individual $individual) {
134
+function print_navigator_family(Family $family, Individual $individual)
135
+{
135 136
     foreach ($family->getSpouses() as $spouse) {
136 137
         ?>
137 138
         <tr class="fact_value">
Please login to merge, or discard this patch.