Changeset 2089 for trunk/include

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:

• trunk/include/functions.inc.php (modified) (6 diffs)

trunk/include/functions.inc.php

@@ -430 +430 @@
 
   $do_log = trigger_event('pwg_log_allowed', $do_log, $image_id, $image_type);
-  
+
   if (!$do_log)
   {
@@ -460 +460 @@
   list($curyear, $curmonth, $curday) = explode('-', $curdate);
   list($curhour) = explode(':', $curtime);
-  
+
   $query = '
 INSERT INTO '.HISTORY_TABLE.'
@@ -713 +713 @@
  *
  * @param array $rejects
+ * @param boolean $escape - if true escape & to & (for html)
  * @returns string
  */
-function get_query_string_diff($rejects = array())
+function get_query_string_diff($rejects=array(), $escape=true)
 {
   $query_string = '';
@@ -727 +728 @@
     if (!in_array($key, $rejects))
     {
-      $query_string.= $is_first ? '?' : '&';
+      $query_string.= $is_first ? '?' : ($escape ? '&' : '&' );
       $is_first = false;
       $query_string.= $key.'='.$value;
@@ -840 +841 @@
     $thumbnail_title = '';
   }
-  
+
   if (!empty($element_info['filesize']))
   {
@@ -1076 +1077 @@
  *
  * @param element/array $key_args: element or array of l10n_args elements
- * @param $sep: if $key_args is array, 
+ * @param $sep: if $key_args is array,
  *   separator is used when translated l10n_args elements are concated
  * @return string