malhuda/CodeIgniter4
1
0
Fork 0
mirror of https://github.com/codeigniter4/CodeIgniter4.git synced 2025-02-20 11:44:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 4.5

Browse Source
This commit is contained in:
kenjis 2024-02-14 09:14:56 +09:00
commit 2968e1f1fd
No known key found for this signature in database
GPG Key ID: BD254878922AF198
6 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Views/welcome_message.php
View File

@ -214,11 +214,11 @@
<button id="menuToggle">&#9776;</button>
</li>
<li class="menu-item hidden"><a href="#">Home</a></li>
<li class="menu-item hidden"><a href="https://codeigniter4.github.io/userguide/" target="_blank">Docs</a>
<li class="menu-item hidden"><a href="https://codeigniter.com/user_guide/" target="_blank">Docs</a>
</li>
<li class="menu-item hidden"><a href="https://forum.codeigniter.com/" target="_blank">Community</a></li>
<li class="menu-item hidden"><a
href="https://github.com/codeigniter4/CodeIgniter4/blob/develop/CONTRIBUTING.md" target="_blank">Contribute</a>
href="https://codeigniter.com/contribute" target="_blank">Contribute</a>
</li>
</ul>
</div>
@ -264,7 +264,7 @@
<p>The User Guide contains an introduction, tutorial, a number of "how to"
guides, and then reference documentation for the components that make up
the framework. Check the <a href="https://codeigniter4.github.io/userguide"
the framework. Check the <a href="https://codeigniter.com/user_guide/"
target="_blank">User Guide</a> !</p>
<h2>

2
system/Debug/Toolbar/Views/_config.tpl
View File

@ -1,5 +1,5 @@
<p class="debug-bar-alignRight">
<a href="https://codeigniter4.github.io/CodeIgniter4/index.html" target="_blank" >Read the CodeIgniter docs...</a>
<a href="https://codeigniter.com/user_guide/" target="_blank" >Read the CodeIgniter docs...</a>
</p>
<table>

2
system/Session/Handlers/BaseHandler.php
View File

@ -43,7 +43,7 @@ abstract class BaseHandler implements SessionHandlerInterface
* Cookie prefix
*
* The Config\Cookie::$prefix setting is completely ignored.
* See https://codeigniter4.github.io/CodeIgniter4/libraries/sessions.html#session-preferences
* See https://codeigniter.com/user_guide/libraries/sessions.html#session-preferences
*
* @var string
*/

2
user_guide_src/source/general/common_functions.rst
View File

@ -387,7 +387,7 @@ Miscellaneous Functions
:returns: a route path (URI path relative to baseURL)
:rtype: string
.. note:: This function requires the controller/method to have a route defined in **app/Config/routes.php**.
.. note:: This function requires the controller/method to have a route defined in **app/Config/Routes.php**.
.. important:: ``route_to()`` returns a *route* path, not a full URI path for your site.
If your **baseURL** contains sub folders, the return value is not the same

2
user_guide_src/source/helpers/url_helper.rst
View File

@ -382,7 +382,7 @@ The following functions are available:
:returns: Absolute URL
:rtype: string
.. note:: This function requires the controller/method to have a route defined in **app/Config/routes.php**.
.. note:: This function requires the controller/method to have a route defined in **app/Config/Routes.php**.
Builds an absolute URL to a controller method in your app. Example:

7
user_guide_src/source/incoming/routing/069.php
View File

@ -4,7 +4,10 @@
// Would execute the show404 method of the App\Errors class
$routes->set404Override('App\Errors::show404');
// Will display a custom view
// Will display a custom view.
$routes->set404Override(static function () {
echo view('my_errors/not_found.html');
// If you want to get the URI segments.
$segments = request()->getUri()->getSegments();
return view('my_errors/not_found.html');
});