Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
project
drupal
Commits
ab87217a
Commit
ab87217a
authored
Jun 20, 2013
by
Dries
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#1999340
by chertzog, kim.pepper: Use Symfony Request for comment module.
parent
23faf5a2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
core/modules/comment/comment.admin.inc
core/modules/comment/comment.admin.inc
+1
-1
core/modules/comment/comment.module
core/modules/comment/comment.module
+3
-3
core/modules/comment/comment.pages.inc
core/modules/comment/comment.pages.inc
+1
-1
No files found.
core/modules/comment/comment.admin.inc
View file @
ab87217a
...
...
@@ -20,7 +20,7 @@
* @see comment_multiple_delete_confirm()
*/
function
comment_admin
(
$type
=
'new'
)
{
$edit
=
$_POST
;
$edit
=
Drupal
::
request
()
->
request
->
all
()
;
if
(
isset
(
$edit
[
'operation'
])
&&
(
$edit
[
'operation'
]
==
'delete'
)
&&
isset
(
$edit
[
'comments'
])
&&
$edit
[
'comments'
])
{
return
drupal_get_form
(
'comment_multiple_delete_confirm'
);
...
...
core/modules/comment/comment.module
View file @
ab87217a
...
...
@@ -430,12 +430,12 @@ function comment_permalink(Comment $comment) {
$page
=
comment_get_display_page
(
$comment
->
id
(),
$node
->
type
);
// @todo: Cleaner sub request handling.
$request
=
d
rupal
_container
()
->
get
(
'
request
'
);
$request
=
D
rupal
::
request
(
);
$subrequest
=
Request
::
create
(
'/node/'
.
$node
->
nid
,
'GET'
,
$request
->
query
->
all
(),
$request
->
cookies
->
all
(),
array
(),
$request
->
server
->
all
());
$subrequest
->
query
->
set
(
'page'
,
$page
);
// @todo: Convert the pager to use the request object.
$
_GET
[
'page'
]
=
$page
;
return
d
rupal
_container
()
->
get
(
'http_kernel'
)
->
handle
(
$subrequest
,
HttpKernelInterface
::
SUB_REQUEST
);
$
request
->
query
->
set
(
'page'
,
$page
)
;
return
D
rupal
::
service
(
'http_kernel'
)
->
handle
(
$subrequest
,
HttpKernelInterface
::
SUB_REQUEST
);
}
throw
new
NotFoundHttpException
();
}
...
...
core/modules/comment/comment.pages.inc
View file @
ab87217a
...
...
@@ -38,7 +38,7 @@
function
comment_reply
(
EntityInterface
$node
,
$pid
=
NULL
)
{
// Set the breadcrumb trail.
drupal_set_breadcrumb
(
array
(
l
(
t
(
'Home'
),
NULL
),
l
(
$node
->
label
(),
'node/'
.
$node
->
nid
)));
$op
=
isset
(
$_POST
[
'op'
])
?
$_POST
[
'op'
]
:
''
;
$op
=
Drupal
::
request
()
->
request
->
get
(
'op'
)
;
$build
=
array
();
// The user is previewing a comment prior to submitting it.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment