[Fusionforge-commits] FusionForge branch master updated. 6.0.4-874-g8248d43

Marc-Etienne VARGENAU Wed, 14 Sep 2016 02:03:39 -0700

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  8248d43a10940800b02354b6946ea48338ef5a35 (commit)
      from  d19beeb48495347f87f3bcb3b66d9c65a007b315 (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=8248d43a10940800b02354b6946ea48338ef5a35

commit 8248d43a10940800b02354b6946ea48338ef5a35
Author: Marc-Etienne Vargenau <[email protected]>
Date:   Wed Sep 14 11:03:07 2016 +0200

    &amp;

diff --git a/src/common/include/utils.php b/src/common/include/utils.php
index 18fd3b5..0b97a92 100644
--- a/src/common/include/utils.php
+++ b/src/common/include/utils.php
@@ -599,15 +599,15 @@ function ShowResultSet($result, $title = '', $linkify = 
false, $displayHeaders =
                                if (in_array($i, $colsToKeep)) {
                                        if ($linkify && $i == 0) {
                                                if ($linkify == "bug_cat") {
-                                                       $linkUrl = 
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&bug_cat_mod=y&bug_cat_id='.db_result($result,
 $j, 'bug_category_id'), db_result($result, $j, $i));
+                                                       $linkUrl = 
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&amp;bug_cat_mod=y&amp;bug_cat_id='.db_result($result,
 $j, 'bug_category_id'), db_result($result, $j, $i));
                                                } elseif ($linkify == 
"bug_group") {
-                                                       $linkUrl = 
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&bug_group_mod=y&bug_group_id='.db_result($result,
 $j, 'bug_group_id'), db_result($result, $j, $i));
+                                                       $linkUrl = 
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&amp;bug_group_mod=y&amp;bug_group_id='.db_result($result,
 $j, 'bug_group_id'), db_result($result, $j, $i));
                                                } elseif ($linkify == 
"patch_cat") {
-                                                       $linkUrl = 
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&patch_cat_mod=y&patch_cat_id='.db_result($result,
 $j, 'patch_category_id'), db_result($result, $j, $i));
+                                                       $linkUrl = 
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&amp;patch_cat_mod=y&amp;patch_cat_id='.db_result($result,
 $j, 'patch_category_id'), db_result($result, $j, $i));
                                                } elseif ($linkify == 
"support_cat") {
-                                                       $linkUrl = 
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&support_cat_mod=y&support_cat_id='.db_result($result,
 $j, 'support_category_id'), db_result($result, $j, $i));
+                                                       $linkUrl = 
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&amp;support_cat_mod=y&amp;support_cat_id='.db_result($result,
 $j, 'support_category_id'), db_result($result, $j, $i));
                                                } elseif ($linkify == 
"pm_project") {
-                                                       $linkUrl = 
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&project_cat_mod=y&project_cat_id='.db_result($result,
 $j, 'group_project_id'), db_result($result, $j, $i));
+                                                       $linkUrl = 
util_make_link(getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&amp;project_cat_mod=y&amp;project_cat_id='.db_result($result,
 $j, 'group_project_id'), db_result($result, $j, $i));
                                                } else {
                                                        $linkUrl = 
db_result($result, $j, $i);
                                                }
diff --git a/src/common/tracker/actions/taskmgr.php 
b/src/common/tracker/actions/taskmgr.php
index c7f0fb6..f9e5942 100644
--- a/src/common/tracker/actions/taskmgr.php
+++ b/src/common/tracker/actions/taskmgr.php
@@ -104,7 +104,7 @@ if (getStringFromRequest('add_to_task')) {
                'title'=>_('Build Relationship Between Tracker Items and 
Tasks'),
                'modal'=>1));
 
-       echo $HTML->openForm(array('name' => 'foo', 'action' => 
'/tracker/?func=taskmgr&group_id='.$group_id.'&atid='.$atid.'&aid='.$aid, 
'method' => 'post'));
+       echo $HTML->openForm(array('name' => 'foo', 'action' => 
'/tracker/?func=taskmgr&amp;group_id='.$group_id.'&amp;atid='.$atid.'&amp;aid='.$aid,
 'method' => 'post'));
        echo '
                <p><strong>'._('Tracker Item')._(':').'</strong> 
[#'.$a->getID().'] '.$a->getSummary().'</p>
                <p><strong>'._('Tasks Project')._(':').'</strong><br />';
@@ -160,7 +160,7 @@ if (getStringFromRequest('add_to_task')) {
                'title'=>_('Build Relationship Between Tracker Items and 
Tasks'),
                'modal'=>1));
 
-       echo $HTML->openForm(array('name' => 'foo', 'action' => 
'/tracker/?func=taskmgr&group_id='.$group_id.'&atid='.$atid.'&aid='.$aid, 
'method' => 'post'));
+       echo $HTML->openForm(array('name' => 'foo', 'action' => 
'/tracker/?func=taskmgr&amp;group_id='.$group_id.'&amp;atid='.$atid.'&amp;aid='.$aid,
 'method' => 'post'));
        echo '
                <p><strong>'._('Tracker Item')._(':').'</strong> 
[#'.$a->getID().'] '.$a->getSummary().'</p>
                <p><strong>'._('Tasks Project')._(':').'</strong></p>
diff --git a/src/www/mail/admin/deletelist.php 
b/src/www/mail/admin/deletelist.php
index 6d73640..e33b91f 100644
--- a/src/www/mail/admin/deletelist.php
+++ b/src/www/mail/admin/deletelist.php
@@ -66,7 +66,7 @@ mail_header(array('title' => _('Permanently Delete Mailing 
List ') . $ml->getNam
 ?>
 <fieldset>
 <legend><?php echo _('Confirm Delete'); ?></legend>
-<?php echo $HTML->openForm(array('method' => 'post', 'action' => 
getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&group_list_id='.$ml->getID()));
 ?>
+<?php echo $HTML->openForm(array('method' => 'post', 'action' => 
getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&amp;group_list_id='.$ml->getID()));
 ?>
 <p><?php printf(_("Do you really want to delete mailing list %s?"), 
$ml->getName()); ?></p>
 <p>
        <input id="sure" type="checkbox" name="sure" value="1" />
diff --git a/src/www/project/admin/roledelete.php 
b/src/www/project/admin/roledelete.php
index 5764580..dacc74e 100644
--- a/src/www/project/admin/roledelete.php
+++ b/src/www/project/admin/roledelete.php
@@ -85,7 +85,7 @@ printf(_('You are about to permanently delete role %s'), 
$role->getName()); ?>
 <td>
 <fieldset>
 <legend><?php echo _('Confirm Delete') ?></legend>
-<?php echo $HTML-> openForm(array('action' => 
getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&role_id='.$role_id, 
'method' => 'post')); ?>
+<?php echo $HTML-> openForm(array('action' => 
getStringFromServer('PHP_SELF').'?group_id='.$group_id.'&amp;role_id='.$role_id,
 'method' => 'post')); ?>
 <p>
 <input id="sure" type="checkbox" value="1" name="sure" />
 <label for="sure">
diff --git a/src/www/reporting/usertime.php b/src/www/reporting/usertime.php
index e7dc8c9..4b3c7aa 100644
--- a/src/www/reporting/usertime.php
+++ b/src/www/reporting/usertime.php
@@ -73,7 +73,7 @@ for ($i=0; $i<count($abc_array); $i++) {
        if ($sw == $abc_array[$i]) {
                echo '<strong>'.$abc_array[$i].'</strong>&nbsp;';
        } else {
-               echo 
util_make_link('/reporting/usertime.php?sw='.$abc_array[$i].'&typ='.$typ, 
$abc_array[$i]).'&nbsp;';
+               echo 
util_make_link('/reporting/usertime.php?sw='.$abc_array[$i].'&amp;typ='.$typ, 
$abc_array[$i]).'&nbsp;';
        }
 }
 
diff --git a/src/www/search/include/renderers/HtmlSearchRenderer.class.php 
b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
index c8aee3b..d352848 100644
--- a/src/www/search/include/renderers/HtmlSearchRenderer.class.php
+++ b/src/www/search/include/renderers/HtmlSearchRenderer.class.php
@@ -156,9 +156,9 @@ class HtmlSearchRenderer extends SearchRenderer {
                $offset = $this->searchQuery->getOffset() - 
$this->searchQuery->getRowsPerPage();
                $query =& $this->query;
 
-               $url = 
'/search/?type='.$query['typeOfSearch'].'&exact='.$query['isExact'].'&q='.urlencode($query['words']);
+               $url = 
'/search/?type='.$query['typeOfSearch'].'&amp;exact='.$query['isExact'].'&amp;q='.urlencode($query['words']);
                if($offset > 0) {
-                       $url .= '&offset='.$offset;
+                       $url .= '&amp;offset='.$offset;
                }
                return $url;
        }
@@ -170,7 +170,7 @@ class HtmlSearchRenderer extends SearchRenderer {
         */
        function getNextResultsUrl() {
                $query =& $this->query;
-               return 
'/search/?type='.$query['typeOfSearch'].'&exact='.$query['isExact'].'&q='.urlencode($query['words']).'&offset='.($this->searchQuery->getOffset()
 + $this->searchQuery->getRowsPerPage());
+               return 
'/search/?type='.$query['typeOfSearch'].'&amp;exact='.$query['isExact'].'&amp;q='.urlencode($query['words']).'&amp;offset='.($this->searchQuery->getOffset()
 + $this->searchQuery->getRowsPerPage());
        }
 
        /**

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

Summary of changes:
 src/common/include/utils.php                                  | 10 +++++-----
 src/common/tracker/actions/taskmgr.php                        |  4 ++--
 src/www/mail/admin/deletelist.php                             |  2 +-
 src/www/project/admin/roledelete.php                          |  2 +-
 src/www/reporting/usertime.php                                |  2 +-
 src/www/search/include/renderers/HtmlSearchRenderer.class.php |  6 +++---
 6 files changed, 13 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits

[Fusionforge-commits] FusionForge branch master updated. 6.0.4-874-g8248d43

Reply via email to