Bugfix for pictures that weren't stored / reworked database calls

[friendica.git] / include / plugin.php

diff --git a/include/plugin.php b/include/plugin.php
index 1ea3ed73d19c00873987039c994b4cef0ef9f4b7..d5bceafdea82406e6b9ff770e647d325bfcbd50e 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -6,6 +6,7 @@
  */
 
 use Friendica\App;
+use Friendica\Core\System;
 
 /**
  * @brief uninstalls an addon.
@@ -401,10 +402,10 @@ function get_theme_screenshot($theme) {
        $exts = array('.png','.jpg');
        foreach ($exts as $ext) {
                if (file_exists('view/theme/' . $theme . '/screenshot' . $ext)) {
-                       return(App::get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext);
+                       return(System::baseUrl() . '/view/theme/' . $theme . '/screenshot' . $ext);
                }
        }
-       return(App::get_baseurl() . '/images/blank.png');
+       return(System::baseUrl() . '/images/blank.png');
 }
 
 // install and uninstall theme
@@ -544,6 +545,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 . '/';