Changeset 4911


Ignore:
Timestamp:
02/19/10 10:20:11 (10 years ago)
Author:
plg
Message:

merge r4910 from branch 2.0 to trunk

feature 967: optionnaly transmit the original filename to pwg.images.add. When
transmitted, it fills the images.file column.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/ws_functions.inc.php

    r4903 r4911  
    12451245  // database registration 
    12461246  $insert = array( 
    1247     'file' => $filename_wo_ext.'.jpg', 
     1247    'file' => !empty($params['original_filename']) ? $params['original_filename'] : $filename_wo_ext.'.jpg', 
    12481248    'date_available' => $dbnow, 
    12491249    'tn_ext' => 'jpg', 
  • trunk/ws.php

    r4513 r4911  
    205205      'high_sum' => array('default' => null), 
    206206      'original_sum' => array(), 
     207      'original_filename' => array('default' => null), 
    207208      'name' => array('default' => null), 
    208209      'author' => array('default' => null), 
Note: See TracChangeset for help on using the changeset viewer.