aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-11-04 15:25:00 -0800
committerfriendica <info@friendica.com>2014-11-04 15:25:00 -0800
commit7a92157187c59ae68eb585e5bd0ae1d7c9aa6162 (patch)
treea3d29649fce4a3251f30985293cd508991e4f4ec
parentba7f1bb8eee5f5374246a512b6c510f874f417ce (diff)
parent474e7fff0059352b82734dc81716b646873705d8 (diff)
downloadvolse-hubzilla-7a92157187c59ae68eb585e5bd0ae1d7c9aa6162.tar.gz
volse-hubzilla-7a92157187c59ae68eb585e5bd0ae1d7c9aa6162.tar.bz2
volse-hubzilla-7a92157187c59ae68eb585e5bd0ae1d7c9aa6162.zip
Merge https://github.com/friendica/red into pending_merge
-rwxr-xr-xindex.php11
1 files changed, 0 insertions, 11 deletions
diff --git a/index.php b/index.php
index ae8a2e17d..7a61fd3b8 100755
--- a/index.php
+++ b/index.php
@@ -198,21 +198,10 @@ if(strlen($a->module)) {
if(! $a->module_loaded) {
- /*
- * Traditionally we looked in custom first, but we're leaning toward a convention where site
- * specific things are all in directories called 'site'. So custom will be going away.
- * There are a very small number of folks affected. You know who you are. Once you've got things sorted,
- * please remove the lines for "custom/" and push to the project repository.
- */
-
if(file_exists("mod/site/{$a->module}.php")) {
include_once("mod/site/{$a->module}.php");
$a->module_loaded = true;
}
- elseif(file_exists("custom/{$a->module}.php")) {
- include_once("custom/{$a->module}.php");
- $a->module_loaded = true;
- }
elseif(file_exists("mod/{$a->module}.php")) {
include_once("mod/{$a->module}.php");
$a->module_loaded = true;