[Fusionforge-commits] FusionForge branch master updated. 3df44480175431d6d7bfec1fc98785778fe86b24

Roland Mas lolando at fusionforge.org
Fri Feb 14 10:31:03 CET 2014


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  3df44480175431d6d7bfec1fc98785778fe86b24 (commit)
       via  eb9d847ef77522c713922081748d9f86885bc1fa (commit)
       via  bbff52749314fca5eed105de2fa47e828d274985 (commit)
       via  c474ea8db3edcd8579ff2dfa4b01b7080dafa2e0 (commit)
       via  d78b562ff93a0cf8ef587b9c436abab9cc547ff5 (commit)
       via  0412e3a145c09609e9a9e843522ec35e52b64b4b (commit)
       via  072d67dda614580c3eaaa3b854fe112d70ed99fa (commit)
       via  7cebf84726b3ac975811b55353f0b5cf1bb0c93f (commit)
       via  dceca8b18bbc51988a2583acde1c2b1b4ae6e6db (commit)
       via  9f4589a65e168093ce8d473b12fb707821a18b27 (commit)
       via  b532b94aa5d9e4e1c1cb0e92874620b327b42860 (commit)
       via  a7daf6c6d2f05c46d1494a5a1ca89e1d66d4d38b (commit)
       via  edf83566218131ccecf4e8179693b47f25177488 (commit)
       via  3954bbc8f7d9c783695c54969a4f417be1d68263 (commit)
       via  88569a787ebf36fd0de618b70b9a12cb250c713d (commit)
       via  8a2e8a1bfdf44ff952a3d989896373e5e0f8ea08 (commit)
       via  12bbed26e308c6ee6338da0dfeb8662474fcb061 (commit)
       via  5e73b624c01006ac4bfce06f449aae8fc1b7d3ca (commit)
       via  de6f2200f227ac38ecdc1823cc33ea03d7656daf (commit)
       via  11bf1c0db546f9707b1c082c3048404b8dfe418d (commit)
       via  045b3f636cc0e9d679703fc9ae996731358adc8f (commit)
       via  b648479152b0aaeb5cd7b7c82d1ad6820cc468a5 (commit)
       via  84d3ee4db3622848b4e6a3825acd2b0fded2dca0 (commit)
       via  283a7b5af74bcbbd7102db7af131f0a9ea3295c6 (commit)
       via  7e8eb01dbf93144dfa7eb1da4417bfa7b05d5e92 (commit)
       via  770ec86c8221d63fbd0961c5001d34f6e92599b5 (commit)
       via  58750f0d1009832dd3ef824791c878e64572b7d9 (commit)
       via  a8093615fbf7005508b7d5d944ad374c538ca814 (commit)
       via  15eeff5d872304166e06bbb010b8ad36600d7248 (commit)
       via  4515115b5c08987294566d229ceec35d0627e5cc (commit)
       via  5f034a97ef2dd7ba99559a312232467543730f3e (commit)
       via  4f9bea75dddf0bd10cfd178694e1e487562907a8 (commit)
       via  c0b2c25046b3326345d23ce40efec0cafcdee920 (commit)
       via  bd831c4347a90c9c5c4120e29fdcee5fb6cdd05f (commit)
       via  b60d3afe172c34928300c864cf6f30d143225884 (commit)
       via  0371729b6c96b8a5ac6e65871fb2fbf6327ce8de (commit)
       via  ce356ca4ae467d9ba554a7a86279f07f27931efe (commit)
       via  df3e42562e704117e51293b447a9263ffa46e96e (commit)
       via  ac3503f443ef78197af87b9621101c058a1099b9 (commit)
       via  04c41eee76f2655e5e4aa7e4abf262a8d97df14c (commit)
       via  22422335009c4dc7680ce292767821d0bd23e0d9 (commit)
       via  5ed907f66158ac462737e0cdc598015d7d710e80 (commit)
       via  ac51b3029ab2f577befb16db325a7d7f852ff5e1 (commit)
       via  d63db37f5ce2316be16c0f98d1142c110e119e8f (commit)
       via  fe025fe941ced6d7b7f79ef2326d629c9f82542b (commit)
       via  8975e1658e40f8e6e46994e0d0faa3eb793a8472 (commit)
       via  99d7a6415c3ebbd86c8f9d94a1c5acd9ee8e9b41 (commit)
       via  8b0255b3be29700918d0ac657994ec1618d7c5b1 (commit)
       via  9b05f43f21162ab8042728344991c6f3a5437757 (commit)
       via  97a45eaf51d70a54d411734eccb3cbc64ef5c616 (commit)
       via  6f9d38eeb8e1903eb45941567817d7f593d1d27d (commit)
       via  8b3de120cb77a86a6e13396428ba4c72a96a9d73 (commit)
       via  457febc372afefefcd2b5e48748321bd3068c7a6 (commit)
      from  5d8695eacb51f91e7420336a460b46d2f74c4d86 (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 3df44480175431d6d7bfec1fc98785778fe86b24
Merge: 5d8695e eb9d847
Author: Roland Mas <lolando at debian.org>
Date:   Fri Feb 14 10:30:41 2014 +0100

    Merged from 5.3: fixes to people, snippets, install-ng

diff --cc src/common/include/RBACEngine.class.php
index 989d815,e814d40..ee66d39
--- a/src/common/include/RBACEngine.class.php
+++ b/src/common/include/RBACEngine.class.php
@@@ -352,23 -352,23 +352,26 @@@ class RBACEngine extends Error implemen
  		case 'tracker':
  			switch ($action) {
  			case 'ANY':
 -				$qpa = db_construct_qpa ($qpa, 'AND perm_val != 0');
 +				$qpa = db_construct_qpa($qpa, 'AND perm_val != 0');
  				break;
  			case 'read':
 -				$qpa = db_construct_qpa ($qpa, 'AND (perm_val & 1) = 1');
 +				$qpa = db_construct_qpa($qpa, 'AND (perm_val & 1) = 1');
  				break;
  			case 'tech':
 -				$qpa = db_construct_qpa ($qpa, 'AND (perm_val & 2) = 2');
 +				$qpa = db_construct_qpa($qpa, 'AND (perm_val & 2) = 2');
  				break;
  			case 'manager':
 -				$qpa = db_construct_qpa ($qpa, 'AND (perm_val & 4) = 4');
 +				$qpa = db_construct_qpa($qpa, 'AND (perm_val & 4) = 4');
  				break;
  			case 'submit':
 -				$qpa = db_construct_qpa ($qpa, 'AND (perm_val & 8) = 8');
 +				$qpa = db_construct_qpa($qpa, 'AND (perm_val & 8) = 8');
 +				break;
 +			case 'vote':
 +				$qpa = db_construct_qpa ($qpa, 'AND (perm_val & 16) = 16');
  				break;
+ 			case 'vote':
+ 				$qpa = db_construct_qpa ($qpa, 'AND (perm_val & 16) = 16');
+ 				break;
  			}
  			break;
  		case 'pm':

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

Summary of changes:
 src/common/include/Group.class.php      |    6 +++---
 src/common/include/RBACEngine.class.php |    3 +++
 src/install/install3                    |    2 ++
 src/packaging/control/000source         |    2 +-
 src/www/people/editprofile.php          |    6 +++---
 src/www/people/helpwanted-latest.php    |    2 +-
 src/www/snippet/delete.php              |   14 +++++++-------
 src/www/snippet/detail.php              |    2 +-
 src/www/snippet/snippet_utils.php       |    2 +-
 src/www/snippet/submit.php              |   12 ++++++------
 10 files changed, 28 insertions(+), 23 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list