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 b0a451822afcd073b6c75fc5f9a58d10820865a5 (commit)
via 652cb80c67d91c47796305e7d39f4a0e9c006436 (commit)
via c563566f703d75d1277754c72bb5f4446a21b90f (commit)
from ed93c4191bda693ed62ce2b2f4764c4e1f67d724 (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=b0a451822afcd073b6c75fc5f9a58d10820865a5
commit b0a451822afcd073b6c75fc5f9a58d10820865a5
Author: Franck Villaume <[email protected]>
Date: Fri Jul 8 15:23:26 2016 +0200
hardening check on html_build_select_box_from_arrays: php warning
diff --git a/src/www/include/html.php b/src/www/include/html.php
index 0f17bc0..c8bdc8f 100644
--- a/src/www/include/html.php
+++ b/src/www/include/html.php
@@ -675,7 +675,11 @@ function html_build_select_box_from_arrays($vals, $texts,
$select_name,
// we want to preserve that value UNLESS that value was 'xzxz',
the default value
//
if (!$checked_found && $checked_val != 'xzxz' && $checked_val &&
$checked_val != 100) {
- $return .= html_e('option', array_merge(array('value' =>
util_html_secure($checked_val), 'selected' => 'selected'),
$opts_attrs[$checked_val]), _('No Change'), false);
+ $optionAttrs = array('value' => util_html_secure($checked_val),
'selected' => 'selected');
+ if (isset($opt_attrs[$checked_val]) &&
is_array($opt_attrs[$checked_val])) {
+ $optionAttrs = array_merge($optionAttrs,
$opt_attrs[$checked_val]);
+ }
+ $return .= html_e('option', $optionAttrs, _('No Change'),
false);
$have_a_subelement = true;
}
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=652cb80c67d91c47796305e7d39f4a0e9c006436
commit 652cb80c67d91c47796305e7d39f4a0e9c006436
Author: Franck Villaume <[email protected]>
Date: Fri Jul 8 15:22:59 2016 +0200
fix PHP warning
diff --git a/src/common/include/SCMPlugin.class.php
b/src/common/include/SCMPlugin.class.php
index 76fb63b..1a8bc5b 100644
--- a/src/common/include/SCMPlugin.class.php
+++ b/src/common/include/SCMPlugin.class.php
@@ -45,7 +45,7 @@ abstract class SCMPlugin extends Plugin {
$this->provides['scm'] = true;
}
- function CallHook($hookname, $params) {
+ function CallHook($hookname, &$params) {
switch ($hookname) {
case 'group_plugin_use': {
if ($params['val'] == true) {
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=c563566f703d75d1277754c72bb5f4446a21b90f
commit c563566f703d75d1277754c72bb5f4446a21b90f
Author: Franck Villaume <[email protected]>
Date: Fri Jul 8 15:22:43 2016 +0200
fix PHP warning
diff --git a/src/common/frs/FRSPackageFactory.class.php
b/src/common/frs/FRSPackageFactory.class.php
index a14f9a7..cf63636 100644
--- a/src/common/frs/FRSPackageFactory.class.php
+++ b/src/common/frs/FRSPackageFactory.class.php
@@ -85,7 +85,7 @@ class FRSPackageFactory extends FFError {
foreach ($ids as $id) {
if (forge_check_perm('frs', $id, 'read')) {
- $this->FRSs[] =& frspackage_get_object($id);
+ $this->FRSs[] = frspackage_get_object($id);
}
}
return $this->FRSs;
-----------------------------------------------------------------------
Summary of changes:
src/common/frs/FRSPackageFactory.class.php | 2 +-
src/common/include/SCMPlugin.class.php | 2 +-
src/www/include/html.php | 6 +++++-
3 files changed, 7 insertions(+), 3 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
