aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2017-12-17 12:32:35 +0100
committerGravatar GitHub <noreply@github.com> 2017-12-17 12:32:35 +0100
commit4a17c81badfd42d53c718e3317623b0dfdcc44c2 (patch)
tree311b04fa2fb2c409f908d70e7ec41de3ed0ea4b6
parent6b202eb291d83fcbf8799988028fc86f2e04a6c6 (diff)
parent3b2dfdbe1e6f0ef9c97734e56f941456046cd7f2 (diff)
Merge pull request #1729 from Alkarex/Minz_Dispatcher_paths
Minz Dispatcher Controllers path
-rw-r--r--CHANGELOG.md1
-rw-r--r--lib/Minz/Dispatcher.php3
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5dbabff60..453a06b7d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
* Hebrew [#1716](https://github.com/FreshRSS/FreshRSS/pull/1716)
* Improved German [#1698](https://github.com/FreshRSS/FreshRSS/pull/1698)
* Extensions
+ * Breaking change: uppercase `./Controllers/` directory [#1729](https://github.com/FreshRSS/FreshRSS/pull/1729)
* Show existing extensions in admin panel [#1708](https://github.com/FreshRSS/FreshRSS/pull/1708)
* New function `$entry->_hash($hex)` for extensions that change the content of entries [#1707](https://github.com/FreshRSS/FreshRSS/pull/1707)
* Misc.
diff --git a/lib/Minz/Dispatcher.php b/lib/Minz/Dispatcher.php
index bdb1c76f6..f05b285b5 100644
--- a/lib/Minz/Dispatcher.php
+++ b/lib/Minz/Dispatcher.php
@@ -10,7 +10,6 @@
* C'est un singleton
*/
class Minz_Dispatcher {
- const CONTROLLERS_PATH_NAME = '/Controllers';
/* singleton */
private static $instance = null;
@@ -149,7 +148,7 @@ class Minz_Dispatcher {
*/
private static function loadController($base_name) {
$base_path = self::$registrations[$base_name];
- $controller_filename = $base_path . '/controllers/' . $base_name . 'Controller.php';
+ $controller_filename = $base_path . '/Controllers/' . $base_name . 'Controller.php';
include_once $controller_filename;
}