jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid warning

Browse source
This commit is contained in:
Michael 2017-08-14 05:47:25 +00:00
parent 217a8ce6ee
commit 1fa82581b6
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/plugin.php
View file

@ -544,6 +544,8 @@ function upgrade_bool_message($bbcode = false) {
* @return string Path to the file or empty string if the file isn't found * @return string Path to the file or empty string if the file isn't found
*/ */
function theme_include($file, $root = '') { function theme_include($file, $root = '') {
$file = basename($file);
// Make sure $root ends with a slash / if it's not blank // Make sure $root ends with a slash / if it's not blank
if ($root !== '' && $root[strlen($root)-1] !== '/') { if ($root !== '' && $root[strlen($root)-1] !== '/') {
$root = $root . '/'; $root = $root . '/';

2
index.php
View file

@ -498,7 +498,7 @@ if (isset($_GET["mode"])) {
} }
// If there is no page template use the default page template // If there is no page template use the default page template
if (!$template) { if (empty($template)) {
$template = theme_include("default.php"); $template = theme_include("default.php");
} }