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, 6.1 has been updated
       via  e8955686b6d2e397aa3ce16ca7725be8fed18e64 (commit)
      from  283713343a6f26784dd5e4acc39f84904f6e0dfc (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=e8955686b6d2e397aa3ce16ca7725be8fed18e64

commit e8955686b6d2e397aa3ce16ca7725be8fed18e64
Author: Franck Villaume <[email protected]>
Date:   Tue Jan 2 13:44:24 2018 +0000

    quick hack to avoid empty td cell

diff --git 
a/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php 
b/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
index 09576d4..71d289d 100644
--- 
a/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
+++ 
b/src/www/search/include/renderers/AdvancedSearchHtmlSearchRenderer.class.php
@@ -340,7 +340,7 @@ class AdvancedSearchHtmlSearchRenderer extends 
HtmlGroupSearchRenderer {
                $res .= $HTML->openForm(array('class' => 'ff', 'name' => 
'advancedsearch', 'action' => getStringFromServer('PHP_SELF'), 'method' => 
'post'));
                $res .= '<input class="ff" type="hidden" name="search" 
value="1"/>
                        <input class="ff" type="hidden" name="group_id" 
value="'.$group_id.'"/>
-                       <div align="center"><br />
+                       <div align="center">
                        <table id="advsearchinput">
                                <tr class="ff">
                                <td class="ff" colspan ="2">
@@ -405,6 +405,7 @@ EOS;
                                </tr>
                                <tr class="top tablecontent">
                                        <td>';
+               $i = 0;
                foreach($sectionsArray as $key => $section) {
                        $oldcountlines = $countLines;
                        if (is_array($section)) {
@@ -413,7 +414,7 @@ EOS;
                                $countLines += 3;
                        }
 
-                       if ($countLines >= $break) {
+                       if ($countLines >= $break && $i) {
                                // if we are closer to the limit with this one 
included, then
                                // it's better to include it.
                                if (($countCol < $maxCol) && ($countLines - 
$break) >= ($break - $oldcountlines)) {
@@ -454,6 +455,7 @@ EOS;
                                        $break += $breakLimit;
                                }
                        }
+                       $i++;
                }
 
                return $return.'                </td>

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

Summary of changes:
 .../include/renderers/AdvancedSearchHtmlSearchRenderer.class.php    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
FusionForge

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

Reply via email to