diff options
author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 23:56:13 -0400 |
---|---|---|
committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 23:56:13 -0400 |
commit | 5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c (patch) | |
tree | 5ce33b1595a2dd7d94e43ca9d2efc7be8facc94b /mod/view.php | |
parent | 9472ba8d2031183cc9d573f27e02511c1c5a3050 (diff) | |
parent | 5d35f0d54a52801dd9a17d4e44c294e4c9168de3 (diff) | |
download | volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.tar.gz volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.tar.bz2 volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.zip |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
add title to D* posts
allow users to set categories on their posts
Modified peopleyouknow to handle sites without Facebook better
diabook-themes: add link to global dir in "find friends" at right_aside
modified: mod/newmember.php
New user quick start.
check for style.php existence before inclusion
Moved Diaspora notes away from top, per user request
* master:
Diffstat (limited to 'mod/view.php')
-rw-r--r-- | mod/view.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mod/view.php b/mod/view.php index 33aa23f44..15b3733b3 100644 --- a/mod/view.php +++ b/mod/view.php @@ -9,7 +9,8 @@ function view_init($a){ if ($a->argc == 4){ $theme = $a->argv[2]; $THEMEPATH = "view/theme/$theme"; - require_once("view/theme/$theme/style.php"); + if(file_exists("view/theme/$theme/style.php")) + require_once("view/theme/$theme/style.php"); } killme(); |