Changeset 8247
- Timestamp:
- Dec 23, 2010, 6:22:19 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 3 deleted
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/admin/include/functions.php
r8238 r8247 2055 2055 return $tag_ids; 2056 2056 } 2057 2058 /** returns the argument_ids array with new sequenced keys based on related 2059 * names. Sequence is not case sensitive. 2060 * Warning: By definition, this function breaks original keys 2061 */ 2062 function order_by_name($element_ids,$name) 2063 { 2064 $ordered_element_ids = array(); 2065 foreach ($element_ids as $k_id => $element_id) 2066 { 2067 $key = strtolower($name[$element_id]) .'-'. $name[$element_id] .'-'. $k_id; 2068 $ordered_element_ids[$key] = $element_id; 2069 } 2070 ksort($ordered_element_ids); 2071 return $ordered_element_ids; 2072 } 2073 2057 2074 ?> -
trunk/admin/themes/default/theme.css
r6363 r8247 1 1 2 2 /* template css */ 3 /*@import "menubar.css";*/4 3 @import "content.css"; 5 4 @import "thumbnails.css"; -
trunk/include/common.inc.php
r8126 r8247 234 234 add_event_handler('render_category_description', 'nl2br'); 235 235 } 236 add_event_handler('render_comment_content', 'htmlspecialchars'); 237 add_event_handler('render_comment_content', 'parse_comment_content'); 236 add_event_handler('render_comment_content', 'render_comment_content'); 238 237 add_event_handler('render_comment_author', 'strip_tags'); 239 238 add_event_handler('blockmanager_register_blocks', 'register_default_menubar_blocks', EVENT_HANDLER_PRIORITY_NEUTRAL-1); -
trunk/include/functions_html.inc.php
r6993 r8247 44 44 $output = ''; 45 45 $is_first=true; 46 46 47 47 foreach ($cat_informations as $cat) 48 48 { … … 186 186 * @return string 187 187 */ 188 function parse_comment_content($content) 189 { 188 function render_comment_content($content) 189 { 190 $content = htmlspecialchars($content); 190 191 $pattern = '/(https?:\/\/\S*)/'; 191 192 $replacement = '<a href="$1" rel="nofollow">$1</a>'; … … 368 369 $title = 'Piwigo encountered a non recoverable error'; 369 370 } 370 371 371 372 $btrace_msg = ''; 372 373 if ($show_trace and function_exists('debug_backtrace')) … … 441 442 ); 442 443 } 443 444 444 445 $title.= 445 446 '<a href="'.$remove_url.'" style="border:none;" title="' … … 479 480 $protocol = 'HTTP/1.0'; 480 481 481 if ( version_compare( phpversion(), '4.3.0', '>=' ) ) 482 { 483 header( "$protocol $code $text", true, $code ); 484 } 485 else 486 { 487 header( "$protocol $code $text" ); 488 } 482 header( "$protocol $code $text", true, $code ); 489 483 trigger_action('set_status_header', $code, $text); 490 484 } … … 496 490 { 497 491 return strip_tags($desc, '<span><p><a><br><b><i><small><big><strong><em>'); 498 }499 500 /** returns the argument_ids array with new sequenced keys based on related501 * names. Sequence is not case sensitive.502 * Warning: By definition, this function breaks original keys503 */504 function order_by_name($element_ids,$name)505 {506 $ordered_element_ids = array();507 foreach ($element_ids as $k_id => $element_id)508 {509 $key = strtolower($name[$element_id]) .'-'. $name[$element_id] .'-'. $k_id;510 $ordered_element_ids[$key] = $element_id;511 }512 ksort($ordered_element_ids);513 return $ordered_element_ids;514 492 } 515 493 -
trunk/include/functions_url.inc.php
r8079 r8247 736 736 if (!empty($conf['gallery_url'])) 737 737 { 738 if (url_is_remote($conf['gallery_url']) or strncmp($conf['gallery_url'], '/', 1)==0)738 if (url_is_remote($conf['gallery_url']) or $conf['gallery_url'][0]=='/' ) 739 739 { 740 740 return $conf['gallery_url']; -
trunk/themes/default/theme.css
r8169 r8247 560 560 } 561 561 562 /* following declaration is important to avoid strange FF behaviour */563 FORM.filter FIELDSET LABEL SPAN SELECT {564 margin: 0;565 }566 567 FORM.filter FIELDSET P568 {569 clear: left;570 display: block;571 }572 562 573 563 FORM.filter INPUT[type="submit"] {
Note: See TracChangeset
for help on using the changeset viewer.