diff options
| author | Andrey Andreev <narf@bofh.bg> | 2013-01-29 14:05:42 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2013-01-29 14:05:42 +0100 |
| commit | 37d113bc1e9194f49340d834ca5e55aa87a23992 (patch) | |
| tree | daf730ad2e128c118c4d4c70b6e4e201765a1f58 /user_guide_src/source | |
| parent | 0687911229be13e100724dbf8b15b95146b591a9 (diff) | |
| parent | 3b9319bcb11d4a17d9b19a62aef718891f4722ff (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Diffstat (limited to 'user_guide_src/source')
| -rw-r--r-- | user_guide_src/source/general/routing.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/user_guide_src/source/general/routing.rst b/user_guide_src/source/general/routing.rst index 2a0332088..ed21a6109 100644 --- a/user_guide_src/source/general/routing.rst +++ b/user_guide_src/source/general/routing.rst @@ -129,7 +129,7 @@ For those of you who don't know regular expressions and want to learn more about them, `regular-expressions.info <http://www.regular-expressions.info/>` might be a good starting point. -..note:: You can also mix and match wildcards with regular expressions. +.. note:: You can also mix and match wildcards with regular expressions. Callbacks ========= @@ -137,7 +137,7 @@ Callbacks If you are using PHP >= 5.3 you can use callbacks in place of the normal routing rules to process the back-references. Example:: - $route['products/([a-z]+)/edit/(\d+)'] = function ($product_type, $id) + $route['products/([a-zA-Z]+)/edit/(\d+)'] = function ($product_type, $id) { return 'catalog/product_edit/' . strtolower($product_type) . '/' . $id; }; |