Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #1608 about Phalcon\Mvc\Router\Annotations #2332

Merged
merged 2 commits into from
Apr 16, 2014
Merged

Fix #1608 about Phalcon\Mvc\Router\Annotations #2332

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5073d03
Fix #1608 about Phalcon\Mvc\Router\Annotations
baryshev Apr 13, 2014
412db0d
Test case for #1608
baryshev Apr 13, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Fix #1608 about Phalcon\Mvc\Router\Annotations 
Make it possible to define default route with `@Route('/')` annotation
  • Loading branch information
@baryshev
baryshev committed Apr 13, 2014
commit 5073d03454c9a4ef92ba93c26fa778a9c21fd607
6 changes: 5 additions & 1 deletion ext/mvc/router/annotations.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,11 @@ PHP_METHOD(Phalcon_Mvc_Router_Annotations, processActionAnnotation){
PHALCON_INIT_VAR(uri);
PHALCON_CONCAT_VV(uri, route_prefix, value);
} else {
PHALCON_CPY_WRT(uri, route_prefix);
if (Z_TYPE_P(route_prefix) != IS_NULL) {
PHALCON_CPY_WRT(uri, route_prefix);
} else {
PHALCON_CPY_WRT(uri, value);
}
}
} else {
PHALCON_INIT_NVAR(uri);
Expand Down