Changeset 2572
- Timestamp:
- Sep 23, 2008, 3:04:41 AM (16 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/functions_category.inc.php
r2521 r2572 271 271 l10n('Rank'), 272 272 'rank ASC', 273 ('categories' == @$page['section'] and !isset($page['flat']) )273 ('categories' == @$page['section'] and !isset($page['flat']) and !isset($page['chronology_field']) ) 274 274 ) 275 275 )); -
trunk/include/functions_search.inc.php
r2521 r2572 300 300 * @return string 301 301 */ 302 function get_qsearch_like_clause($q, $field )302 function get_qsearch_like_clause($q, $field, $before='%', $after='%') 303 303 { 304 304 $q = stripslashes($q); … … 394 394 if ( strlen($tokens[$i])==0) 395 395 continue; 396 $clauses[] = $field.' LIKE " %'.addslashes($tokens[$i]).'%"';396 $clauses[] = $field.' LIKE "'.$before.addslashes($tokens[$i]).$after.'"'; 397 397 } 398 398 -
trunk/include/functions_user.inc.php
r2537 r2572 43 43 44 44 $atom = '[-a-z0-9!#$%&\'*+\\/=?^_`{|}~]'; // before arobase 45 $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name 45 $domain = '([a-z0-9]([-a-z0-9]*[a-z0-9]+)?)'; // domain name 46 46 $regex = '/^' . $atom . '+' . '(\.' . $atom . '+)*' . '@' . '(' . $domain . '{1,63}\.)+' . $domain . '{2,63}$/i'; 47 47 … … 852 852 function get_browser_language(&$lang) 853 853 { 854 if (!empty($_SERVER["HTTP_ACCEPT_LANGUAGE"])) 855 { 856 $browser_language = substr($_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2); 857 } 858 else 859 { 860 $browser_language = ''; 861 } 854 $browser_language = substr(@$_SERVER["HTTP_ACCEPT_LANGUAGE"], 0, 2); 862 855 foreach (get_languages() as $language_code => $language_name) 863 856 { -
trunk/include/ws_functions.inc.php
r2569 r2572 30 30 function ws_isInvokeAllowed($res, $methodName, $params) 31 31 { 32 global $conf , $calling_partner_id;32 global $conf; 33 33 34 34 if ( strpos($methodName,'reflection.')===0 ) … … 416 416 $row[$key] = (int)$row[$key]; 417 417 } 418 418 419 419 array_push($cats, $row); 420 420 } -
trunk/picture.php
r2549 r2572 127 127 if ( pwg_get_session_var('show_metadata') == null ) 128 128 { 129 pwg_set_session_var('show_metadata', 1 , 86400, cookie_path());129 pwg_set_session_var('show_metadata', 1 ); 130 130 } else { 131 131 pwg_unset_session_var('show_metadata'); 132 133 132 } 134 135 133 } 136 134 -
trunk/template/yoga/default-layout.css
r2550 r2572 274 274 border-collapse : collapse; 275 275 } 276 276 277 #theHeader {text-align: center;} 277 #debug { margin: 15px 15px 5px 248px; font-size:12px; clear: both; word-wrap:break-word;}
Note: See TracChangeset
for help on using the changeset viewer.