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 /mod | |
| 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 'mod')
| -rw-r--r-- | mod/admin.php | 8 | ||||
| -rw-r--r-- | mod/settings.php | 10 | ||||
| -rw-r--r-- | mod/view.php | 4 |
3 files changed, 11 insertions, 11 deletions
diff --git a/mod/admin.php b/mod/admin.php index c8ed7a53b..44010efda 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -46,8 +46,8 @@ function admin_post(&$a){ break; case 'themes': $theme = $a->argv[2]; - if (is_file("view/theme/$theme/config.php")){ - require_once("view/theme/$theme/config.php"); + if (is_file("view/theme/$theme/php/config.php")){ + require_once("view/theme/$theme/php/config.php"); if (function_exists("theme_admin_post")){ theme_admin_post($a); } @@ -937,8 +937,8 @@ function admin_page_themes(&$a){ } $admin_form=""; - if (is_file("view/theme/$theme/config.php")){ - require_once("view/theme/$theme/config.php"); + if (is_file("view/theme/$theme/php/config.php")){ + require_once("view/theme/$theme/php/config.php"); if(function_exists("theme_admin")){ $admin_form = theme_admin($a); } diff --git a/mod/settings.php b/mod/settings.php index 5e8c78ae7..7c944a149 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -5,12 +5,12 @@ function get_theme_config_file($theme){ $a = get_app(); $base_theme = $a->theme_info['extends']; - if (file_exists("view/theme/$theme/config.php")){ - return "view/theme/$theme/config.php"; + if (file_exists("view/theme/$theme/php/config.php")){ + return "view/theme/$theme/php/config.php"; } - if (file_exists("view/theme/$base_theme/config.php")){ - return "view/theme/$base_theme/config.php"; - } + //if (file_exists("view/theme/$base_theme/php/config.php")){ + // return "view/theme/$base_theme/php/config.php"; + //} return null; } diff --git a/mod/view.php b/mod/view.php index 15b3733b3..965e18067 100644 --- a/mod/view.php +++ b/mod/view.php @@ -9,8 +9,8 @@ function view_init($a){ if ($a->argc == 4){ $theme = $a->argv[2]; $THEMEPATH = "view/theme/$theme"; - if(file_exists("view/theme/$theme/style.php")) - require_once("view/theme/$theme/style.php"); + if(file_exists("view/theme/$theme/php/style.php")) + require_once("view/theme/$theme/php/style.php"); } killme(); |