View GitHub Repository TYPO3.CMS

Schedule Inspection
Subscribe
Passed
Push — master ( 45c4e1...27d14a )
by
unknown
20:05
created
Status
Category
Toggle Patches
typo3/sysext/form/Classes/Domain/Finishers/EmailFinisher.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch 
@@ -243,8 +243,8 @@
 
 block discarded – undo
243 243
244 244 
         $standaloneView->assign('form', $formRuntime);
245 245 
         $standaloneView->getRenderingContext()
246 
-                       ->getViewHelperVariableContainer()
247 
-                       ->addOrUpdate(RenderRenderableViewHelper::class, 'formRuntime', $formRuntime);
246 
+                        ->getViewHelperVariableContainer()
247 
+                        ->addOrUpdate(RenderRenderableViewHelper::class, 'formRuntime', $formRuntime);
248 248
249 249 
         return $standaloneView;
250 250 
     }
Please login to merge, or discard this patch.
typo3/sysext/felogin/Classes/Redirect/RedirectHandler.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -158,7 +158,7 @@
 
 block discarded – undo
158 158 
         }
159 159
160 160 
         // Remove empty values, but keep "0" as value (that's why "strlen" is used as second parameter)
161 
-        $redirectUrlList = array_filter($redirectUrlList, static function (string $value): bool {
161 
+        $redirectUrlList = array_filter($redirectUrlList, static function(string $value): bool {
162 162 
             return strlen($value) > 0;
163 163 
         });
164 164
Please login to merge, or discard this patch.
sysext/dashboard/Classes/Widgets/Provider/SysLogErrorsDataProvider.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -103,7 +103,7 @@
 
 block discarded – undo
103 103 
         for ($daysBefore = $this->days; $daysBefore >= 0; $daysBefore--) {
104 104 
             $this->labels[] = date($format, (int)strtotime('-' . $daysBefore . ' day'));
105 105 
             $startPeriod = (int)strtotime('-' . $daysBefore . ' day 0:00:00');
106 
-            $endPeriod =  (int)strtotime('-' . $daysBefore . ' day 23:59:59');
106 
+            $endPeriod = (int)strtotime('-' . $daysBefore . ' day 23:59:59');
107 107
108 108 
             $this->data[] = $this->getNumberOfErrorsInPeriod($startPeriod, $endPeriod);
109 109 
         }
Please login to merge, or discard this patch.
typo3/sysext/belog/Classes/Controller/BackendLogController.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -184,7 +184,7 @@
 
 block discarded – undo
184 184 
     protected function resetConstraintsOnMemoryExhaustionError()
185 185 
     {
186 186 
         $reservedMemory = new \SplFixedArray(187500); // 3M
187 
-        register_shutdown_function(function () use (&$reservedMemory): void {
187 
+        register_shutdown_function(function() use (&$reservedMemory): void {
188 188 
             $reservedMemory = null; // free the reserved memory
189 189 
             $error = error_get_last();
190 190 
             if (strpos($error['message'], 'Allowed memory size of') !== false) {
Please login to merge, or discard this patch.
typo3/sysext/redirects/Classes/Repository/RedirectRepository.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -67,7 +67,7 @@
 
 block discarded – undo
67 67
68 68 
         $constraints = [];
69 69 
         if ($demand->hasSourceHosts()) {
70 
-            $constraints[] =$queryBuilder->expr()->in(
70 
+            $constraints[] = $queryBuilder->expr()->in(
71 71 
                 'source_host',
72 72 
                 $queryBuilder->createNamedParameter($demand->getSourceHosts(), Connection::PARAM_STR_ARRAY)
73 73 
             );
Please login to merge, or discard this patch.
typo3/sysext/dashboard/Classes/WidgetRegistry.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -108,7 +108,7 @@
 
 block discarded – undo
108 108 
      */
109 109 
     protected function checkPermissionOfWidgets(array $widgets): array
110 110 
     {
111 
-        return array_filter($widgets, function ($identifier) {
111 
+        return array_filter($widgets, function($identifier) {
112 112 
             return $this->getBackendUser()->check('available_widgets', $identifier);
113 113 
         }, ARRAY_FILTER_USE_KEY);
114 114 
     }
Please login to merge, or discard this patch.
sysext/backend/Classes/View/Wizard/Element/BackendLayoutWizardElement.php 1 patch
Spacing   +73 added lines, -73 removed lines patch added patch discarded remove patch 
@@ -60,84 +60,84 @@
 
 block discarded – undo
60 60 
         $json = (string)json_encode($this->rows, JSON_HEX_QUOT | JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS);
61 61 
         $html = [];
62 62 
         $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
63 
-        $html[] =   $fieldInformationHtml;
64 
-        $html[] =   '<div class="form-control-wrap">';
65 
-        $html[] =       '<div class="form-wizards-wrap">';
66 
-        $html[] =           '<div class="form-wizards-element">';
67 
-        $html[] =               '<input';
68 
-        $html[] =                   ' type="hidden"';
69 
-        $html[] =                   ' name="' . htmlspecialchars($this->data['parameterArray']['itemFormElName']) . '"';
70 
-        $html[] =                   ' value="' . htmlspecialchars($this->data['parameterArray']['itemFormElValue']) . '"';
71 
-        $html[] =                   '/>';
72 
-        $html[] =               '<table class="grideditor table table-bordered">';
73 
-        $html[] =                   '<tr>';
74 
-        $html[] =                       '<td colspan="2" align="center">';
75 
-        $html[] =                           '<div class="btn-group">';
76 
-        $html[] =                               '<a class="btn btn-default btn-sm t3js-grideditor-removerow-top" href="#"';
77 
-        $html[] =                                   ' title="' . htmlspecialchars($lang->getLL('grid_removeRow')) . '">';
78 
-        $html[] =                                   '<i class="fa fa-fw fa-minus"></i>';
79 
-        $html[] =                               '</a>';
80 
-        $html[] =                               '<a class="btn btn-default btn-sm t3js-grideditor-addrow-top" href="#"';
81 
-        $html[] =                                   ' title="' . htmlspecialchars($lang->getLL('grid_addRow')) . '">';
82 
-        $html[] =                                   '<i class="fa fa-fw fa-plus"></i>';
83 
-        $html[] =                               '</a>';
84 
-        $html[] =                           '</div>';
85 
-        $html[] =                       '</td>';
86 
-        $html[] =                   '</tr>';
87 
-        $html[] =                   '<tr>';
88 
-        $html[] =                       '<td class="editor_cell">';
89 
-        $html[] =                           '<div';
90 
-        $html[] =                               ' id="editor"';
91 
-        $html[] =                               ' class="t3js-grideditor"';
92 
-        $html[] =                               ' data-data="' . htmlspecialchars($json) . '"';
93 
-        $html[] =                               ' data-rowcount="' . (int)$this->rowCount . '"';
94 
-        $html[] =                               ' data-colcount="' . (int)$this->colCount . '"';
95 
-        $html[] =                               ' data-field="' . htmlspecialchars($this->data['parameterArray']['itemFormElName']) . '"';
96 
-        $html[] =                           '>';
97 
-        $html[] =                           '</div>';
98 
-        $html[] =                       '</td>';
99 
-        $html[] =                       '<td>';
100 
-        $html[] =                           '<div class="btn-group-vertical">';
101 
-        $html[] =                               '<a class="btn btn-default btn-sm t3js-grideditor-addcolumn" href="#"';
102 
-        $html[] =                                   ' title="' . htmlspecialchars($lang->getLL('grid_addColumn')) . '">';
103 
-        $html[] =                                   '<i class="fa fa-fw fa-plus"></i>';
104 
-        $html[] =                               '</a>';
105 
-        $html[] =                               '<a class="btn btn-default btn-sm t3js-grideditor-removecolumn" href="#"';
106 
-        $html[] =                                   ' title="' . htmlspecialchars($lang->getLL('grid_removeColumn')) . '">';
107 
-        $html[] =                                   '<i class="fa fa-fw fa-minus"></i>';
108 
-        $html[] =                               '</a>';
109 
-        $html[] =                           '</div>';
110 
-        $html[] =                       '</td>';
111 
-        $html[] =                   '</tr>';
112 
-        $html[] =                   '<tr>';
113 
-        $html[] =                       '<td colspan="2" align="center">';
114 
-        $html[] =                           '<div class="btn-group">';
115 
-        $html[] =                               '<a class="btn btn-default btn-sm t3js-grideditor-addrow-bottom" href="#"';
116 
-        $html[] =                                   ' title="' . htmlspecialchars($lang->getLL('grid_addRow')) . '">';
117 
-        $html[] =                                   '<i class="fa fa-fw fa-plus"></i>';
118 
-        $html[] =                               '</a>';
119 
-        $html[] =                               '<a class="btn btn-default btn-sm t3js-grideditor-removerow-bottom" href="#"';
120 
-        $html[] =                                   ' title="' . htmlspecialchars($lang->getLL('grid_removeRow')) . '">';
121 
-        $html[] =                                   '<i class="fa fa-fw fa-minus"></i>';
122 
-        $html[] =                               '</a>';
123 
-        $html[] =                           '</div>';
124 
-        $html[] =                       '</td>';
125 
-        $html[] =                   '</tr>';
126 
-        $html[] =                   '<tr>';
127 
-        $html[] =                       '<td colspan="2">';
128 
-        $html[] =                           '<a href="#" class="btn btn-default btn-sm t3js-grideditor-preview-button"></a>';
129 
-        $html[] =                           '<pre class="t3js-grideditor-preview-config grideditor-preview"><code></code></pre>';
130 
-        $html[] =                       '</td>';
131 
-        $html[] =                   '</tr>';
132 
-        $html[] =               '</table>';
133 
-        $html[] =           '</div>';
63 
+        $html[] = $fieldInformationHtml;
64 
+        $html[] = '<div class="form-control-wrap">';
65 
+        $html[] = '<div class="form-wizards-wrap">';
66 
+        $html[] = '<div class="form-wizards-element">';
67 
+        $html[] = '<input';
68 
+        $html[] = ' type="hidden"';
69 
+        $html[] = ' name="' . htmlspecialchars($this->data['parameterArray']['itemFormElName']) . '"';
70 
+        $html[] = ' value="' . htmlspecialchars($this->data['parameterArray']['itemFormElValue']) . '"';
71 
+        $html[] = '/>';
72 
+        $html[] = '<table class="grideditor table table-bordered">';
73 
+        $html[] = '<tr>';
74 
+        $html[] = '<td colspan="2" align="center">';
75 
+        $html[] = '<div class="btn-group">';
76 
+        $html[] = '<a class="btn btn-default btn-sm t3js-grideditor-removerow-top" href="#"';
77 
+        $html[] = ' title="' . htmlspecialchars($lang->getLL('grid_removeRow')) . '">';
78 
+        $html[] = '<i class="fa fa-fw fa-minus"></i>';
79 
+        $html[] = '</a>';
80 
+        $html[] = '<a class="btn btn-default btn-sm t3js-grideditor-addrow-top" href="#"';
81 
+        $html[] = ' title="' . htmlspecialchars($lang->getLL('grid_addRow')) . '">';
82 
+        $html[] = '<i class="fa fa-fw fa-plus"></i>';
83 
+        $html[] = '</a>';
84 
+        $html[] = '</div>';
85 
+        $html[] = '</td>';
86 
+        $html[] = '</tr>';
87 
+        $html[] = '<tr>';
88 
+        $html[] = '<td class="editor_cell">';
89 
+        $html[] = '<div';
90 
+        $html[] = ' id="editor"';
91 
+        $html[] = ' class="t3js-grideditor"';
92 
+        $html[] = ' data-data="' . htmlspecialchars($json) . '"';
93 
+        $html[] = ' data-rowcount="' . (int)$this->rowCount . '"';
94 
+        $html[] = ' data-colcount="' . (int)$this->colCount . '"';
95 
+        $html[] = ' data-field="' . htmlspecialchars($this->data['parameterArray']['itemFormElName']) . '"';
96 
+        $html[] = '>';
97 
+        $html[] = '</div>';
98 
+        $html[] = '</td>';
99 
+        $html[] = '<td>';
100 
+        $html[] = '<div class="btn-group-vertical">';
101 
+        $html[] = '<a class="btn btn-default btn-sm t3js-grideditor-addcolumn" href="#"';
102 
+        $html[] = ' title="' . htmlspecialchars($lang->getLL('grid_addColumn')) . '">';
103 
+        $html[] = '<i class="fa fa-fw fa-plus"></i>';
104 
+        $html[] = '</a>';
105 
+        $html[] = '<a class="btn btn-default btn-sm t3js-grideditor-removecolumn" href="#"';
106 
+        $html[] = ' title="' . htmlspecialchars($lang->getLL('grid_removeColumn')) . '">';
107 
+        $html[] = '<i class="fa fa-fw fa-minus"></i>';
108 
+        $html[] = '</a>';
109 
+        $html[] = '</div>';
110 
+        $html[] = '</td>';
111 
+        $html[] = '</tr>';
112 
+        $html[] = '<tr>';
113 
+        $html[] = '<td colspan="2" align="center">';
114 
+        $html[] = '<div class="btn-group">';
115 
+        $html[] = '<a class="btn btn-default btn-sm t3js-grideditor-addrow-bottom" href="#"';
116 
+        $html[] = ' title="' . htmlspecialchars($lang->getLL('grid_addRow')) . '">';
117 
+        $html[] = '<i class="fa fa-fw fa-plus"></i>';
118 
+        $html[] = '</a>';
119 
+        $html[] = '<a class="btn btn-default btn-sm t3js-grideditor-removerow-bottom" href="#"';
120 
+        $html[] = ' title="' . htmlspecialchars($lang->getLL('grid_removeRow')) . '">';
121 
+        $html[] = '<i class="fa fa-fw fa-minus"></i>';
122 
+        $html[] = '</a>';
123 
+        $html[] = '</div>';
124 
+        $html[] = '</td>';
125 
+        $html[] = '</tr>';
126 
+        $html[] = '<tr>';
127 
+        $html[] = '<td colspan="2">';
128 
+        $html[] = '<a href="#" class="btn btn-default btn-sm t3js-grideditor-preview-button"></a>';
129 
+        $html[] = '<pre class="t3js-grideditor-preview-config grideditor-preview"><code></code></pre>';
130 
+        $html[] = '</td>';
131 
+        $html[] = '</tr>';
132 
+        $html[] = '</table>';
133 
+        $html[] = '</div>';
134 134 
         if (!empty($fieldWizardHtml)) {
135 135 
             $html[] = '<div class="form-wizards-items-bottom">';
136 136 
             $html[] = $fieldWizardHtml;
137 137 
             $html[] = '</div>';
138 138 
         }
139 
-        $html[] =       '</div>';
140 
-        $html[] =   '</div>';
139 
+        $html[] = '</div>';
140 
+        $html[] = '</div>';
141 141 
         $html[] = '</div>';
142 142
143 143 
         $html = implode(LF, $html);
Please login to merge, or discard this patch.
typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch 
@@ -140,43 +140,43 @@
 
 block discarded – undo
140 140 
         $html = [];
141 141 
         $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
142 142 
         $html[] = $fieldInformationHtml;
143 
-        $html[] =   '<div class="form-control-wrap">';
144 
-        $html[] =       '<div class="form-wizards-wrap">';
145 
-        $html[] =           '<div class="form-wizards-element">';
146 
-        $html[] =               '<div class="typo3-tceforms-tree">';
147 
-        $html[] =                   '<input class="treeRecord" type="hidden" id="' . htmlspecialchars($fieldId) . '"';
148 
-        $html[] =                       ' data-formengine-validation-rules="' . htmlspecialchars($this->getValidationDataAsJsonString($config)) . '"';
149 
-        $html[] =                       ' data-relatedfieldname="' . htmlspecialchars($parameterArray['itemFormElName']) . '"';
150 
-        $html[] =                       ' data-tablename="' . htmlspecialchars($this->data['tableName']) . '"';
151 
-        $html[] =                       ' data-fieldname="' . htmlspecialchars($this->data['fieldName']) . '"';
152 
-        $html[] =                       ' data-uid="' . (int)$this->data['vanillaUid'] . '"';
153 
-        $html[] =                       ' data-recordtypevalue="' . htmlspecialchars($this->data['recordTypeValue']) . '"';
154 
-        $html[] =                       ' data-datastructureidentifier="' . htmlspecialchars($dataStructureIdentifier) . '"';
155 
-        $html[] =                       ' data-flexformsheetname="' . htmlspecialchars($flexFormSheetName) . '"';
156 
-        $html[] =                       ' data-flexformfieldname="' . htmlspecialchars($flexFormFieldName) . '"';
157 
-        $html[] =                       ' data-flexformcontainername="' . htmlspecialchars($flexFormContainerName) . '"';
158 
-        $html[] =                       ' data-flexformcontaineridentifier="' . htmlspecialchars($flexFormContainerIdentifier) . '"';
159 
-        $html[] =                       ' data-flexformcontainerfieldname="' . htmlspecialchars($flexFormContainerFieldName) . '"';
160 
-        $html[] =                       ' data-flexformsectioncontainerisnew="' . htmlspecialchars((string)$flexFormSectionContainerIsNew) . '"';
161 
-        $html[] =                       ' data-command="' . htmlspecialchars($this->data['command']) . '"';
162 
-        $html[] =                       ' data-read-only="' . $readOnly . '"';
163 
-        $html[] =                       ' data-tree-exclusive-keys="' . htmlspecialchars($exclusiveKeys) . '"';
164 
-        $html[] =                       ' data-tree-expand-up-to-level="' . ($expanded ? '999' : '1') . '"';
165 
-        $html[] =                       ' data-tree-show-toolbar="' . $showHeader . '"';
166 
-        $html[] =                       ' name="' . htmlspecialchars($parameterArray['itemFormElName']) . '"';
167 
-        $html[] =                       ' id="treeinput' . $formElementId . '"';
168 
-        $html[] =                       ' value="' . htmlspecialchars(implode(',', $parameterArray['itemFormElValue'])) . '"';
169 
-        $html[] =                   '/>';
170 
-        $html[] =               '</div>';
171 
-        $html[] =               '<div id="' . $treeWrapperId . '" class="svg-tree-wrapper" style="height: ' . $heightInPx . 'px;"></div>';
172 
-        $html[] =           '</div>';
143 
+        $html[] = '<div class="form-control-wrap">';
144 
+        $html[] = '<div class="form-wizards-wrap">';
145 
+        $html[] = '<div class="form-wizards-element">';
146 
+        $html[] = '<div class="typo3-tceforms-tree">';
147 
+        $html[] = '<input class="treeRecord" type="hidden" id="' . htmlspecialchars($fieldId) . '"';
148 
+        $html[] = ' data-formengine-validation-rules="' . htmlspecialchars($this->getValidationDataAsJsonString($config)) . '"';
149 
+        $html[] = ' data-relatedfieldname="' . htmlspecialchars($parameterArray['itemFormElName']) . '"';
150 
+        $html[] = ' data-tablename="' . htmlspecialchars($this->data['tableName']) . '"';
151 
+        $html[] = ' data-fieldname="' . htmlspecialchars($this->data['fieldName']) . '"';
152 
+        $html[] = ' data-uid="' . (int)$this->data['vanillaUid'] . '"';
153 
+        $html[] = ' data-recordtypevalue="' . htmlspecialchars($this->data['recordTypeValue']) . '"';
154 
+        $html[] = ' data-datastructureidentifier="' . htmlspecialchars($dataStructureIdentifier) . '"';
155 
+        $html[] = ' data-flexformsheetname="' . htmlspecialchars($flexFormSheetName) . '"';
156 
+        $html[] = ' data-flexformfieldname="' . htmlspecialchars($flexFormFieldName) . '"';
157 
+        $html[] = ' data-flexformcontainername="' . htmlspecialchars($flexFormContainerName) . '"';
158 
+        $html[] = ' data-flexformcontaineridentifier="' . htmlspecialchars($flexFormContainerIdentifier) . '"';
159 
+        $html[] = ' data-flexformcontainerfieldname="' . htmlspecialchars($flexFormContainerFieldName) . '"';
160 
+        $html[] = ' data-flexformsectioncontainerisnew="' . htmlspecialchars((string)$flexFormSectionContainerIsNew) . '"';
161 
+        $html[] = ' data-command="' . htmlspecialchars($this->data['command']) . '"';
162 
+        $html[] = ' data-read-only="' . $readOnly . '"';
163 
+        $html[] = ' data-tree-exclusive-keys="' . htmlspecialchars($exclusiveKeys) . '"';
164 
+        $html[] = ' data-tree-expand-up-to-level="' . ($expanded ? '999' : '1') . '"';
165 
+        $html[] = ' data-tree-show-toolbar="' . $showHeader . '"';
166 
+        $html[] = ' name="' . htmlspecialchars($parameterArray['itemFormElName']) . '"';
167 
+        $html[] = ' id="treeinput' . $formElementId . '"';
168 
+        $html[] = ' value="' . htmlspecialchars(implode(',', $parameterArray['itemFormElValue'])) . '"';
169 
+        $html[] = '/>';
170 
+        $html[] = '</div>';
171 
+        $html[] = '<div id="' . $treeWrapperId . '" class="svg-tree-wrapper" style="height: ' . $heightInPx . 'px;"></div>';
172 
+        $html[] = '</div>';
173 173 
         if ($readOnly === 'false' && !empty($fieldWizardHtml)) {
174 
-            $html[] =       '<div class="form-wizards-items-bottom">';
175 
-            $html[] =           $fieldWizardHtml;
176 
-            $html[] =       '</div>';
174 
+            $html[] = '<div class="form-wizards-items-bottom">';
175 
+            $html[] = $fieldWizardHtml;
176 
+            $html[] = '</div>';
177 177 
         }
178 
-        $html[] =       '</div>';
179 
-        $html[] =   '</div>';
178 
+        $html[] = '</div>';
179 
+        $html[] = '</div>';
180 180 
         $html[] = '</div>';
181 181
182 182 
         $resultArray['html'] = implode(LF, $html);
Please login to merge, or discard this patch.
typo3/sysext/backend/Classes/Form/FieldWizard/OtherLanguageContent.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -72,8 +72,8 @@  discard block
 
 block discarded – undo
72 72 
         if ($defaultLanguageValue !== '') {
73 73 
             $iconIdentifier = $this->data['systemLanguageRows'][0]['flagIconIdentifier'] ?: 'flags-multiple';
74 74 
             $html[] = '<div class="t3-form-original-language">';
75 
-            $html[] =   $iconFactory->getIcon($iconIdentifier, Icon::SIZE_SMALL)->render();
76 
-            $html[] =   $this->previewFieldValue($defaultLanguageValue);
75 
+            $html[] = $iconFactory->getIcon($iconIdentifier, Icon::SIZE_SMALL)->render();
76 
+            $html[] = $this->previewFieldValue($defaultLanguageValue);
77 77 
             $html[] = '</div>';
78 78 
         }
79 79 
         $additionalPreviewLanguages = $this->data['additionalLanguageRows'];
 
@@ -87,8 +87,8 @@  discard block
 
 block discarded – undo
87 87 
             ) ?? '';
88 88 
             if ($defaultLanguageValue !== '') {
89 89 
                 $html[] = '<div class="t3-form-original-language">';
90 
-                $html[] =   $iconFactory->getIcon($this->data['systemLanguageRows'][$previewLanguage['sys_language_uid']]['flagIconIdentifier'], Icon::SIZE_SMALL)->render();
91 
-                $html[] =   $this->previewFieldValue($defaultLanguageValue);
90 
+                $html[] = $iconFactory->getIcon($this->data['systemLanguageRows'][$previewLanguage['sys_language_uid']]['flagIconIdentifier'], Icon::SIZE_SMALL)->render();
91 
+                $html[] = $this->previewFieldValue($defaultLanguageValue);
92 92 
                 $html[] = '</div>';
93 93 
             }
94 94 
         }
Please login to merge, or discard this patch.