diff options
| author | Mark Pemberton <mpemberton5@gmail.com> | 2011-06-04 00:38:07 -0400 |
|---|---|---|
| committer | Mark Pemberton <mpemberton5@gmail.com> | 2011-06-04 00:38:07 -0400 |
| commit | b628e63e015bc3b2eadc712feaa6c4d05cf75bbd (patch) | |
| tree | ebdcec5c8133a3b6f86d06dc3f6fb3de46609f04 /src/SemanticScuttle/header.php | |
| parent | 84e603aa91a303a1419962ff3ff6086710a7b1a9 (diff) | |
| parent | 4c8a53c5bc632302aaf8978e711eb53a03166db5 (diff) | |
| download | semanticscuttle-b628e63e015bc3b2eadc712feaa6c4d05cf75bbd.tar.gz semanticscuttle-b628e63e015bc3b2eadc712feaa6c4d05cf75bbd.tar.bz2 | |
Merge branch 'master' into privatekey2
Conflicts:
data/templates/default/bookmarks.tpl.php
Diffstat (limited to 'src/SemanticScuttle/header.php')
| -rw-r--r-- | src/SemanticScuttle/header.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/SemanticScuttle/header.php b/src/SemanticScuttle/header.php index 098e5c3..6c0d4df 100644 --- a/src/SemanticScuttle/header.php +++ b/src/SemanticScuttle/header.php @@ -18,9 +18,12 @@ if ('@data_dir@' == '@' . 'data_dir@') { //non pear-install $datadir = dirname(__FILE__) . '/../../data/'; + $wwwdir = dirname(__FILE__) . '/../../www/'; } else { //pear installation; files are in include path $datadir = '@data_dir@/SemanticScuttle/'; + //FIXME: when you have multiple installations, the www_dir will be wrong + $wwwdir = '@www_dir@/SemanticScuttle/'; } if (!file_exists($datadir . '/config.php')) { |