Project

General

Profile

Revision 582db59d

Added by Assos Assos almost 9 years ago

Update Drupal core to version 7.40

View differences:

drupal7/modules/image/image.module
64 64 
      $effect = image_effect_definition_load($arg[7]);
65 65 
      return isset($effect['help']) ? ('<p>' . $effect['help'] . '</p>') : NULL;
66 66 
    case 'admin/config/media/image-styles/edit/%/effects/%':
67 
      $effect = ($arg[5] == 'add') ? image_effect_definition_load($arg[6]) : image_effect_load($arg[6], $arg[4]);
67 
      $effect = ($arg[5] == 'add') ? image_effect_definition_load($arg[6]) : image_effect_load($arg[7], $arg[5]);
68 68 
      return isset($effect['help']) ? ('<p>' . $effect['help'] . '</p>') : NULL;
69 69 
  }
70 70 
}
......
801 801 
 *
802 802 
 * @param $style
803 803 
 *   The image style
804 
 * @param $scheme
805 
 *   The file scheme, for example 'public' for public files.
804 806 
 */
805 807 
function image_style_deliver($style, $scheme) {
806 808 
  $args = func_get_args();

Also available in: Unified diff