Merge pull request #12034 from annando/no-include
Legacy "include" fragments have been removed
This commit is contained in:
commit
ce64148c8d
5 changed files with 3 additions and 26 deletions
2
Doxyfile
2
Doxyfile
|
@ -1,4 +1,4 @@
|
|||
INPUT = README.md index.php update.php bin/ mod/ include/ view/ src/ VERSION
|
||||
INPUT = README.md index.php update.php bin/ mod/ view/ src/ VERSION
|
||||
RECURSIVE = YES
|
||||
PROJECT_NAME = "Friendica"
|
||||
PROJECT_LOGO = images/friendica-64.png
|
||||
|
|
|
@ -77,7 +77,6 @@ HELP;
|
|||
$files = array_merge(
|
||||
['index.php'],
|
||||
glob('mod/*'),
|
||||
glob('include/*'),
|
||||
glob('addon/*/*'),
|
||||
$this->globRecursive('src')
|
||||
);
|
||||
|
|
|
@ -105,13 +105,6 @@ HELP;
|
|||
$files = glob('mod/*.php');
|
||||
$this->checkFiles($php_path, $files);
|
||||
|
||||
if ($this->getOption('v')) {
|
||||
$this->out('Directory: include');
|
||||
}
|
||||
|
||||
$files = glob('include/*.php');
|
||||
$this->checkFiles($php_path, $files);
|
||||
|
||||
if ($this->getOption('v')) {
|
||||
$this->out('Directory: addon');
|
||||
}
|
||||
|
|
|
@ -315,17 +315,7 @@ class Worker
|
|||
return false;
|
||||
}
|
||||
|
||||
$valid = false;
|
||||
if (strpos($file, 'include/') === 0) {
|
||||
$valid = true;
|
||||
}
|
||||
|
||||
if (strpos($file, 'addon/') === 0) {
|
||||
$valid = true;
|
||||
}
|
||||
|
||||
// Simply return flag
|
||||
return $valid;
|
||||
return (strpos($file, 'addon/') === 0);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -406,11 +396,6 @@ class Worker
|
|||
return true;
|
||||
}
|
||||
|
||||
// The script could be provided as full path or only with the function name
|
||||
if ($include == basename($include)) {
|
||||
$include = 'include/' . $include . '.php';
|
||||
}
|
||||
|
||||
if (!self::validateInclude($include)) {
|
||||
Logger::warning('Include file is not valid', ['file' => $argv[0]]);
|
||||
$stamp = (float)microtime(true);
|
||||
|
|
|
@ -585,7 +585,7 @@ class Notify extends BaseRepository
|
|||
DBA::insert('notify-threads', $fields);
|
||||
|
||||
$emailBuilder->setHeader('Message-ID', $message_id);
|
||||
$log_msg = "include/enotify: No previous notification found for this parent:\n" .
|
||||
$log_msg = "No previous notification found for this parent:\n" .
|
||||
" parent: ${params['parent']}\n" . " uid : ${params['uid']}\n";
|
||||
$this->logger->info($log_msg);
|
||||
} else {
|
||||
|
|
Loading…
Reference in a new issue