Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
UserAdminV2
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
庄欣
UserAdminV2
Commits
450b6951
Commit
450b6951
authored
Aug 13, 2011
by
Taylor Otwell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improving class comments.
parent
f346dae4
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
11 deletions
+6
-11
system/routing/filter.php
+1
-4
system/routing/loader.php
+2
-3
system/routing/route.php
+3
-4
No files found.
system/routing/filter.php
View file @
450b6951
...
...
@@ -49,10 +49,7 @@ class Filter {
// "Before" filters may override the request cycle. For example, an authentication
// filter may redirect a user to a login view if they are not logged in. Because of
// this, we will return the first filter response if overriding is enabled.
if
(
!
is_null
(
$response
)
and
$override
)
{
return
$response
;
}
if
(
!
is_null
(
$response
)
and
$override
)
return
$response
;
}
}
...
...
system/routing/loader.php
View file @
450b6951
...
...
@@ -60,9 +60,8 @@ class Loader {
array_push
(
$segments
,
substr
(
$segment
,
0
,
strpos
(
$segment
,
'.'
)));
}
// Shift the module name off of the beginning of the array so we can locate the
// appropriate route file. Since the module name will not be part of the directory
// structure, we need to get rid of it.
// Since it is no part of the route directory structure, shift the module name off of the
// beginning of the array so we can locate the appropriate route file.
if
(
count
(
$segments
)
>
0
and
ACTIVE_MODULE
!==
'application'
)
{
array_shift
(
$segments
);
...
...
system/routing/route.php
View file @
450b6951
...
...
@@ -52,10 +52,9 @@ class Route {
{
$response
=
null
;
// The callback may be in array form, meaning it has attached filters or is named.
// However, the callback may also simply be a closure. If it is just a closure,
// we can execute it here. Otherwise, we will need to evaluate the route for any
// filters that need to be called.
// The callback may be in array form, meaning it has attached filters or is named and we
// will need to evaluate it further to determine what to do. If the callback is just a
// closure, we can execute it now and return the result.
if
(
is_callable
(
$this
->
callback
))
{
$response
=
call_user_func_array
(
$this
->
callback
,
$this
->
parameters
);
...
...
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