Lo mismo del & para el resto del querystring.

[z.facultad/75.43/tp1.git] / src / lib / faq.functions.php

diff --git a/src/lib/faq.functions.php b/src/lib/faq.functions.php
index 3ce9649471f622b07a3a034c771e1bf3eeb74f2e..abf95d0e6b248027ec841049c00e603de2841e51 100644 (file)
--- a/src/lib/faq.functions.php
+++ b/src/lib/faq.functions.php
@@ -338,22 +338,27 @@ function Faq_Listador($ObjetosAListar,$link = '', $cant = 2)
                // Arrastro query string, si corresponde
     if ( isset($_SERVER['QUERY_STRING'] ) )
                {
                // Arrastro query string, si corresponde
     if ( isset($_SERVER['QUERY_STRING'] ) )
                {

-                $query = $_SERVER['QUERY_STRING'];
+                $query = str_replace('&', '&', $_SERVER['QUERY_STRING']);

                }
                else
                {
                 $query = '';
                }
                }
                else
                {
                 $query = '';
                }

-    if (($pos = strpos($query, 'lista_from=')) !== false)
+    if (($pos = strpos($query, '&lista_from=')) !== false)

     {
     {

-        if ($pos) $query = substr($query, 0, --$pos);
+        if ($pos) $query = substr($query, 0, $pos);
+        else      $query = '';
+    }
+               if (($pos = strpos($query, 'lista_from=')) !== false)
+    {
+        if ($pos) $query = substr($query, 0, $pos );

         else      $query = '';
     }
     for ($i = 0; $i < $pags; ++$i)
     {
         else      $query = '';
     }
     for ($i = 0; $i < $pags; ++$i)
     {

-        $from = $i * $cant;
-        $q = $query ? "$query&lista_from=$from" : "lista_from=$from";
-        printfl('<td><a href="%s?%s">%s</a></td>', $link, $q, $i + 1);
+               $from = $i * $cant;
+                               $q = $query ? "$query&amp;lista_from=$from" : "lista_from=$from";
+                               printfl('<td><a href="%s?%s">%s</a></td>', $link, $q, $i + 1);

     }
                printfl('</tr></table>');
 }
     }
                printfl('</tr></table>');
 }