aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-05 15:15:47 +0000
committerben <ben@36083f99-b078-4883-b0ff-0f9b5a30f544>2008-06-05 15:15:47 +0000
commit0e1ef1156515b7b7b524fa9d676122c93be1e938 (patch)
tree681316925ac71216c9381ee84f9975a9eccec621 /engine
parent0ae667cf5970d93660b32d38e438f83fb73fdff9 (diff)
downloadelgg-0e1ef1156515b7b7b524fa9d676122c93be1e938.tar.gz
elgg-0e1ef1156515b7b7b524fa9d676122c93be1e938.tar.bz2
Further cleanup
git-svn-id: https://code.elgg.org/elgg/trunk@806 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/elgglib.php3
-rw-r--r--engine/lib/filestore.php11
2 files changed, 11 insertions, 3 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 9c071f497..eb4cd97df 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -116,6 +116,9 @@
$vars['page_owner_user'] = $usercache[$vars['page_owner']];
}
}
+ if (!isset($vars['js'])) {
+ $vars['js'] = "";
+ }
// If it's been requested, pass off to a template handler instead
if ($bypass == false && isset($CONFIG->template_handler) && !empty($CONFIG->template_handler)) {
diff --git a/engine/lib/filestore.php b/engine/lib/filestore.php
index 0ade1e906..cecb8d99a 100644
--- a/engine/lib/filestore.php
+++ b/engine/lib/filestore.php
@@ -164,8 +164,12 @@
case "append" : $mode = "a+b"; break;
default: throw new InvalidParameterException(sprintf(elgg_echo('InvalidParameterException:UnrecognisedFileMode'), $mode));
}
-
- return fopen($fullname, $mode);
+
+ if (file_exists($fullname)) {
+ return fopen($fullname, $mode);
+ } else {
+ return false;
+ }
}
public function write($f, $data)
@@ -232,7 +236,8 @@
* @param string $dirroot
*/
protected function make_directory_root($dirroot)
- {
+ {
+ if (!file_exists($dirroot))
if (!@mkdir($dirroot, 0700, true))
throw new IOException(sprintf(elgg_echo('IOException:CouldNotMake'), $dirroot));