diff options
| author | friendica <info@friendica.com> | 2012-08-08 18:50:33 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-08-08 18:50:33 -0700 |
| commit | 432595314affa179bdce439d6e90955cee99cd9e (patch) | |
| tree | 4c5bbe70b336c5482b6a40469a93c828bab9a3e9 /include | |
| parent | 9a39d4ade21af15e9d6a3aae1f467f0d173cc0de (diff) | |
| parent | 5c4246e6033fb1130aa0393878c36d5f3bbd4694 (diff) | |
| download | volse-hubzilla-432595314affa179bdce439d6e90955cee99cd9e.tar.gz volse-hubzilla-432595314affa179bdce439d6e90955cee99cd9e.tar.bz2 volse-hubzilla-432595314affa179bdce439d6e90955cee99cd9e.zip | |
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'include')
| -rw-r--r-- | include/plugin.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/plugin.php b/include/plugin.php index 8f6d6ea98..22745835d 100644 --- a/include/plugin.php +++ b/include/plugin.php @@ -266,9 +266,9 @@ function get_theme_info($theme){ if(file_exists("view/theme/$theme/unsupported")) $info['unsupported'] = true; - if (!is_file("view/theme/$theme/theme.php")) return $info; + if (!is_file("view/theme/$theme/php/theme.php")) return $info; - $f = file_get_contents("view/theme/$theme/theme.php"); + $f = file_get_contents("view/theme/$theme/php/theme.php"); $r = preg_match("|/\*.*\*/|msU", $f, $m); @@ -313,8 +313,8 @@ function get_theme_screenshot($theme) { $a = get_app(); $exts = array('.png','.jpg'); foreach($exts as $ext) { - if(file_exists('view/theme/' . $theme . '/screenshot' . $ext)) - return($a->get_baseurl() . '/view/theme/' . $theme . '/screenshot' . $ext); + if(file_exists('view/theme/' . $theme . '/img/screenshot' . $ext)) + return($a->get_baseurl() . '/view/theme/' . $theme . '/img/screenshot' . $ext); } return($a->get_baseurl() . '/images/blank.png'); } |