Skip to content

Commit

Permalink
Merge pull request FreshRSS#1729 from Alkarex/Minz_Dispatcher_paths
Browse files Browse the repository at this point in the history
Minz Dispatcher Controllers path
  • Loading branch information
Alkarex authored Dec 17, 2017
2 parents 26189fd + ffa3504 commit 35c065b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 1 addition & 2 deletions lib/Minz/Dispatcher.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* C'est un singleton
*/
class Minz_Dispatcher {
const CONTROLLERS_PATH_NAME = '/Controllers';

/* singleton */
private static $instance = null;
Expand Down Expand Up @@ -149,7 +148,7 @@ public static function isRegistered($base_name) {
*/
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;
}

Expand Down

0 comments on commit 35c065b

Please sign in to comment.