Ignore:
Timestamp:
Dec 16, 2011, 10:10:30 AM (9 years ago)
Author:
plg
Message:

merge r12738 from branch 2.3 to trunk

feature 2489 updated: photos added by synchronization can't update their "file" field

File:
1 edited

Legend:

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

    r12730 r12739  
    24282428
    24292429  $info_columns = array(
    2430     'file',
    24312430    'name',
    24322431    'author',
     
    24642463  }
    24652464
     2465  if (isset($params['file']))
     2466  {
     2467    if (!empty($image_row['storage_category_id']))
     2468    {
     2469      new PwgError(500, '[ws_images_setInfo] updating "file" is forbidden on photos added by synchronization');
     2470      exit();
     2471    }
     2472
     2473    $update['file'] = $params['file'];
     2474  }
     2475
    24662476  if (count(array_keys($update)) > 0)
    24672477  {
Note: See TracChangeset for help on using the changeset viewer.