antadis/bebeboutik
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Marion Muszynski 2016-04-12 18:07:38 +02:00
parent 9a576cd82d
commit f38db51e45
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
adm/tabs/AdminProducts.php
View File

@ -1807,17 +1807,18 @@ class AdminProducts extends AdminTab
echo ' </td>
</tr>
</table>
<input type="hidden" name="token" value="'.($token ? $token : $this->token).'" />
</form>';
if (isset($this->_includeTab) AND sizeof($this->_includeTab))
echo '<br /><br />';
<input type="hidden" name="token" value="'.($token ? $token : $this->token).'" />';
if((int)$this->_category->id_parent == 1){
echo '<hr>';
echo '<h2>Ordonner les produits</h2>';
echo '<p><input type="submit" class="button" name="reorder'.$this->table.'" value="'.$this->l('Order products').'" /></p>';
echo '<br /><br />';
}
echo '</form>';
if (isset($this->_includeTab) AND sizeof($this->_includeTab))
echo '<br /><br />';
}