[Fusionforge-commits] FusionForge branch master updated. 1769fcf80df96effc2a36dbd52f1c87541c36908

Alain Peyrat aljeux at fusionforge.org
Fri Dec 14 11:24:25 CET 2012


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  1769fcf80df96effc2a36dbd52f1c87541c36908 (commit)
       via  6b2dc434f5a5274aee9029f1b59b10e4fc8f2add (commit)
      from  8701ccb3f5e74a50c442948948e58332b034c578 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1769fcf80df96effc2a36dbd52f1c87541c36908
Author: Alain Peyrat <aljeux at free.fr>
Date:   Fri Dec 14 11:24:17 2012 +0100

    Fix wrong variable in error message

diff --git a/src/common/include/Storage.class.php b/src/common/include/Storage.class.php
index e3a1e3f..0852c30 100644
--- a/src/common/include/Storage.class.php
+++ b/src/common/include/Storage.class.php
@@ -67,7 +67,7 @@ class Storage extends Error {
 				return false;
 			}
 		} else {
-			$this->setError(sprintf(_('Not a File %1$s or not a directory %2$s.'), $file, $storage));
+			$this->setError(sprintf(_('Not a File %1$s or not a directory %2$s.'), $file, $dir));
 			return false;
 		}
 		return $this;

commit 6b2dc434f5a5274aee9029f1b59b10e4fc8f2add
Author: Alain Peyrat <aljeux at free.fr>
Date:   Fri Dec 14 11:23:28 2012 +0100

    Fix cookie system, set / for path

diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index b07483b..b5df32d 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -1711,19 +1711,19 @@ function util_init_messages() {
 	global $feedback, $warning_msg, $error_msg;
 
 	$feedback = getStringFromCookie('feedback', '');
-	setcookie('feedback');
+	setcookie('feedback', '', time()-3600);
 	$warning_msg = getStringFromCookie('warning_msg', '');
-	setcookie('warning_msg');
+	setcookie('warning_msg', '', time()-3600);
 	$error_msg = getStringFromCookie('error_msg', '');
-	setcookie('error_msg');
+	setcookie('error_msg', '', time()-3600);
 }
 
 function util_save_messages() {
 	global $feedback, $warning_msg, $error_msg;
 
-	setcookie('feedback', $feedback, time() + 10);
-	setcookie('warning_msg', $warning_msg, time() + 10);
-	setcookie('error_msg', $error_msg, time() + 10);
+	setcookie('feedback', $feedback, time() + 10, '/');
+	setcookie('warning_msg', $warning_msg, time() + 10, '/');
+	setcookie('error_msg', $error_msg, time() + 10, '/');
 }
 
 // Local Variables:

-----------------------------------------------------------------------

Summary of changes:
 src/common/include/Storage.class.php |    2 +-
 src/common/include/utils.php         |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list