Changeset 2089 for trunk/include


Ignore:
Timestamp:
Sep 12, 2007, 6:01:54 AM (17 years ago)
Author:
rvelices
Message:

merge -r2088 from branch-1_7 to trunk

  • urls used in http redirections must not be html escaped (eg. should use & instead of &)
File:
1 edited

Legend:

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

    r2086 r2089  
    430430
    431431  $do_log = trigger_event('pwg_log_allowed', $do_log, $image_id, $image_type);
    432  
     432
    433433  if (!$do_log)
    434434  {
     
    460460  list($curyear, $curmonth, $curday) = explode('-', $curdate);
    461461  list($curhour) = explode(':', $curtime);
    462  
     462
    463463  $query = '
    464464INSERT INTO '.HISTORY_TABLE.'
     
    713713 *
    714714 * @param array $rejects
     715 * @param boolean $escape - if true escape & to & (for html)
    715716 * @returns string
    716717 */
    717 function get_query_string_diff($rejects = array())
     718function get_query_string_diff($rejects=array(), $escape=true)
    718719{
    719720  $query_string = '';
     
    727728    if (!in_array($key, $rejects))
    728729    {
    729       $query_string.= $is_first ? '?' : '&';
     730      $query_string.= $is_first ? '?' : ($escape ? '&' : '&' );
    730731      $is_first = false;
    731732      $query_string.= $key.'='.$value;
     
    840841    $thumbnail_title = '';
    841842  }
    842  
     843
    843844  if (!empty($element_info['filesize']))
    844845  {
     
    10761077 *
    10771078 * @param element/array $key_args: element or array of l10n_args elements
    1078  * @param $sep: if $key_args is array, 
     1079 * @param $sep: if $key_args is array,
    10791080 *   separator is used when translated l10n_args elements are concated
    10801081 * @return string
Note: See TracChangeset for help on using the changeset viewer.