From 183c476b5984c2d288e01b0c1eb8145d6b035d08 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Mon, 10 Sep 2012 08:18:28 -0400
Subject: [PATCH] - Added check for the apps vhost to find out if the default PHP-FPM pool uses port 9000 or the socket /var/run/php5-fpm.sock.
---
server/lib/classes/system.inc.php | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index b1f9103..01b70fe 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -673,7 +673,7 @@
$app->log("Action aborted, file is a symlink: $filename",LOGLEVEL_WARN);
return false;
}
- return file_put_contents($filename, $data);
+ return file_get_contents($filename, $data);
}
function rename($filename, $new_filename, $allow_symlink = false) {
@@ -699,8 +699,8 @@
}
}
- function unlink($file) {
- if(file_exists($filename)) {
+ function unlink($filename) {
+ if(file_exists($filename) || is_link($filename)) {
return unlink($filename);
}
}
@@ -1152,7 +1152,7 @@
function make_trashscan(){
global $app;
//trashscan erstellen
- // Template �ffnen
+ // Template Öffnen
$app->tpl->clear_all();
$app->tpl->define( array(table => 'trashscan.master'));
--
Gitblit v1.9.1