dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] FO : fixed bug #PSCFV-3189

Browse Source
This commit is contained in:
vAugagneur
2012-08-03 12:47:28 +00:00
parent 71dfd1f810
commit 45d1224d73
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Link.php
+4 -4
View File
@@ -469,7 +469,7 @@ class LinkCore
if (method_exists($this, $method_name) && isset($_GET['id_'.Dispatcher::getInstance()->getController()])) if (method_exists($this, $method_name) && isset($_GET['id_'.Dispatcher::getInstance()->getController()]))
{ {
$type = Dispatcher::getInstance()->getController(); $type = Dispatcher::getInstance()->getController();
$id_object = $_GET['id_'.Dispatcher::getInstance()->getController()]; $id_object = $_GET['id_'.$type];
} }
} }
@@ -518,11 +518,11 @@ class LinkCore
return $url.(($this->allow == 1 || $url == $this->url) ? '?' : '&').http_build_query($vars, '', '&'); return $url.(($this->allow == 1 || $url == $this->url) ? '?' : '&').http_build_query($vars, '', '&');
$vars['requestUrl'] = $url; $vars['requestUrl'] = $url;
if (!$this->allow == 1)
$vars['controller'] = Dispatcher::getInstance()->getController();
if ($type && $id_object) if ($type && $id_object)
$vars['id_'.$type] = (is_object($id_object) ? (int)$id_object->id : (int)$id_object); $vars['id_'.$type] = (is_object($id_object) ? (int)$id_object->id : (int)$id_object);
if (!$this->allow == 1)
$vars['controller'] = Dispatcher::getInstance()->getController();
return $vars; return $vars;
} }
themes/default/nbr-product-page.tpl
+7 -8
View File
@@ -45,6 +45,13 @@
{if isset($search_query) AND $search_query}<input type="hidden" name="search_query" value="{$search_query|escape:'htmlall':'UTF-8'}" />{/if} {if isset($search_query) AND $search_query}<input type="hidden" name="search_query" value="{$search_query|escape:'htmlall':'UTF-8'}" />{/if}
{if isset($tag) AND $tag AND !is_array($tag)}<input type="hidden" name="tag" value="{$tag|escape:'htmlall':'UTF-8'}" />{/if} {if isset($tag) AND $tag AND !is_array($tag)}<input type="hidden" name="tag" value="{$tag|escape:'htmlall':'UTF-8'}" />{/if}
<label for="nb_item">{l s='Show:'}</label> <label for="nb_item">{l s='Show:'}</label>
{if is_array($requestNb)}
{foreach from=$requestNb item=requestValue key=requestKey}
{if $requestKey != 'requestUrl'}
<input type="hidden" name="{$requestKey|escape:'htmlall':'UTF-8'}" value="{$requestValue|escape:'htmlall':'UTF-8'}" />
{/if}
{/foreach}
{/if}
<select name="n" id="nb_item" onchange="document.getElementById('nbrItemPage').submit();"> <select name="n" id="nb_item" onchange="document.getElementById('nbrItemPage').submit();">
{assign var="lastnValue" value="0"} {assign var="lastnValue" value="0"}
{foreach from=$nArray item=nValue} {foreach from=$nArray item=nValue}
@@ -55,14 +62,6 @@
{/foreach} {/foreach}
</select> </select>
<span>{l s='products by page'}</span> <span>{l s='products by page'}</span>
<input type="hidden" name="controller" value="{$page_name}" />
{if is_array($requestNb)}
{foreach from=$requestNb item=requestValue key=requestKey}
{if $requestKey != 'requestUrl'}
<input type="hidden" name="{$requestKey|escape:'htmlall':'UTF-8'}" value="{$requestValue|escape:'htmlall':'UTF-8'}" />
{/if}
{/foreach}
{/if}
</p> </p>
</form> </form>
{/if} {/if}