Fix #1608 about Phalcon\Mvc\Router\Annotations

Make it possible to define default route with `@Route('/')` annotation
phalcon · Apr 13, 2014 · 5073d03 · 5073d03
1 parent 82960cb
commit 5073d03
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/ext/mvc/router/annotations.c b/ext/mvc/router/annotations.c
@@ -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);