Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit f355248

Browse filesBrowse files
committed
Merge branch '2.3' into 2.7
2 parents 559748b + e73d7a6 commit f355248
Copy full SHA for f355248

File tree

Expand file treeCollapse file tree

3 files changed

+5
-5
lines changed
Filter options
Expand file treeCollapse file tree

3 files changed

+5
-5
lines changed

‎cookbook/configuration/override_dir_structure.rst

Copy file name to clipboardExpand all lines: cookbook/configuration/override_dir_structure.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Override the ``cache`` Directory
3030
--------------------------------
3131

3232
You can change the default cache directory by overriding the ``getCacheDir`` method
33-
in the ``AppKernel`` class of you application::
33+
in the ``AppKernel`` class of your application::
3434

3535
// app/AppKernel.php
3636

‎cookbook/form/form_customization.rst

Copy file name to clipboardExpand all lines: cookbook/form/form_customization.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -767,8 +767,8 @@ will be able to change the widget for each task as follows:
767767

768768
{% block _tasks_entry_widget %}
769769
<tr>
770-
<td>{{ form_widget(task.task) }}</td>
771-
<td>{{ form_widget(task.dueDate) }}</td>
770+
<td>{{ form_widget(form.task) }}</td>
771+
<td>{{ form_widget(form.dueDate) }}</td>
772772
</tr>
773773
{% endblock %}
774774

‎cookbook/profiler/data_collector.rst

Copy file name to clipboardExpand all lines: cookbook/profiler/data_collector.rst
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ block and set the value of two variables called ``icon`` and ``text``:
160160
{% endset %}
161161

162162
{# the 'link' value set to 'false' means that this panel doesn't
163-
show a section in the web profiler (default is 'true'). #}
163+
show a section in the web profiler #}
164164
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { link: false }) }}
165165
{% endblock %}
166166

@@ -203,7 +203,7 @@ must also define additional blocks:
203203
</div>
204204
{% endset %}
205205

206-
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig') }}
206+
{{ include('@WebProfiler/Profiler/toolbar_item.html.twig', { 'link': true }) }}
207207
{% endblock %}
208208

209209
{% block head %}

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.