Avoid warning

diff --git a/include/plugin.php b/include/plugin.php
index 1ea3ed73d19c00873987039c994b4cef0ef9f4b7..4dd79b521adedc67d799fe72e00c6bd6cf7cefca 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -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
  */
 function theme_include($file, $root = '') {
+       $file = basename($file);
+
        // Make sure $root ends with a slash / if it's not blank
        if ($root !== '' && $root[strlen($root)-1] !== '/') {
                $root = $root . '/';

diff --git a/index.php b/index.php
index 9ddb47efc693883d170803c8acdb3ae2f16aaf4e..e67ace1326cc6b261bf4c87a9433714cae1ca0bf 100644 (file)
--- a/index.php
+++ b/index.php
@@ -498,7 +498,7 @@ if (isset($_GET["mode"])) {
 }
 
 // If there is no page template use the default page template
-if (!$template) {
+if (empty($template)) {
        $template = theme_include("default.php");
 }