Ignore:
Timestamp:
2007/07/24 21:57:44 (14 years ago)
Author:
adati
Message:

1.4.2betaのマージ

Location:
branches/beta/data/lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/beta/data/lib/glib.php

    r14676 r15120  
    170170            for($i = $count; 1 <= $i; $i--) { 
    171171                $move_number = $i + 1; 
    172                  
    173                 if(file_exists("$path.$move_number")) unlink("$path.$move_number"); 
    174                 copy("$dirname/" . $arrLog[$i - 1], "$path.$move_number");       
    175                  
     172                @copy("$dirname/" . $arrLog[$i - 1], "$path.$move_number"); 
    176173            } 
    177174            $ret = copy($path, "$path.1"); 
  • branches/beta/data/lib/slib.php

    r15056 r15120  
    1616// Á´¥Ú¡¼¥¸¶¦ÄÌ¥¨¥é¡¼ 
    1717$GLOBAL_ERR = ""; 
    18  
    1918// ¥¤¥ó¥¹¥È¡¼¥ë½é´ü½èÍý 
    2019sfInitInstall(); 
     
    17111710 *  $template_id ¤¬ 1¡§·ÈÂÓÍѥƥó¥×¥ì¡¼¥È¡¢0¡§PCÍѥƥó¥×¥ì¡¼¥È 
    17121711 */ 
    1713 function sfSendOrderMail($order_id, $template_id, $subject = "", $body, $send = true) { 
     1712function sfSendOrderMail($order_id, $template_id, $subject = "", $body = "", $send = true) { 
    17141713    global $arrMAILTPLPATH; 
    17151714     
     
    17471746    $objPage->arrCustomer = $arrCustomer; 
    17481747    $objPage->arrOrder = $arrOrder; 
    1749  
     1748     
    17501749    //¤½¤Î¾·èºÑ¾ðÊó 
    17511750    if($arrOrder['memo02'] != "") { 
     
    17731772    // ¥á¡¼¥ëËÜʸ¤Î¼èÆÀ 
    17741773    $objMailView->assignobj($objPage); 
    1775     $name = $objPage->arrCustomer['name01']." ".$objPage->arrCustomer['name02']; 
     1774    $name = $objPage->arrOrder['order_name01']." ".$objPage->arrOrder['order_name02']; 
    17761775    $objPage->tpl_body = ereg_replace( "(\{name\})", $name ,  $objPage->tpl_body ); 
    17771776    $tmp_subject = ereg_replace( "(\{name\})", $name ,  $tmp_subject ); 
Note: See TracChangeset for help on using the changeset viewer.