WordPress.org
Get WordPress

Plugin Directory

Changeset 467262


Ignore:
Timestamp:
11/25/2011 04:51:10 AM (14 years ago)
Author:
1tui8
Message:
 
File:
1 edited

Legend:

Unmodified
Added
Removed

  • wp-alicart/trunk/alicart_button.php

    r467037 r467262  
    8080                    $replacement .= $var_output;
    8181                }
     82<<<<<<< .mine
     83               
     84                $replacement .= '<input type="submit" class="alicart_button alicart_add_to_cart" value="'.$alicartAddButtonName.'" />';
     85=======
    8286               
    8387                $replacement .= '<input name="submit" type="submit" class="alicart_button alicart_add_to_cart" value="'.$alicartAddButtonName.'" />';
     88>>>>>>> .r467261
    8489                               
    8590/*              if (preg_match("/http/", $alicartAddButtonName))
    … …  
    115120
    116121        $replacement = '<object><form method="post"  action="" style="display:inline">';
     122<<<<<<< .mine
     123        $replacement .= '<input type="submit" class="alicart_button alicart_add_to_cart" value="'.$alicartAddButtonName.'" />';
     124        //若设置按钮名称
     125/*      if (preg_match("/http:/", $alicartAddButtonName))
     126=======
    117127        $replacement .= '<input name="submit" type="submit" class="alicart_button alicart_add_to_cart" value="'.$alicartAddButtonName.'" />';
    118128        //若设置按钮名称
    119129/*      if (preg_match("/http:/", $alicartAddButtonName))
     130>>>>>>> .r467261
    120131        {
    121132            $replacement .= '<input name="submit" type="submit" class="alicart_button" value="'.$alicartAddButtonName.'" />';
Note: See TracChangeset for help on using the changeset viewer.