Ignore:
Timestamp:
Oct 16, 2008, 2:38:26 AM (16 years ago)
Author:
rvelices
Message:

merge 2755 and 2756 from branch 2.0 to trunk

File:
1 edited

Legend:

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

    r2683 r2757  
    11881188function ws_session_logout($params, &$service)
    11891189{
    1190   global $user, $conf;
    11911190  if (!is_a_guest())
    11921191  {
    1193     $_SESSION = array();
    1194     session_unset();
    1195     session_destroy();
    1196     setcookie(session_name(),'',0,
    1197         ini_get('session.cookie_path'),
    1198         ini_get('session.cookie_domain')
    1199       );
    1200     setcookie($conf['remember_me_name'], '', 0, cookie_path());
     1192    logout_user();
    12011193  }
    12021194  return true;
     
    14361428
    14371429  invalidate_user_cache();
    1438  
     1430
    14391431  return $creation_output;
    14401432}
     
    14741466    PREG_SPLIT_NO_EMPTY
    14751467    );
    1476  
     1468
    14771469  $query = '
    14781470SELECT
     
    14801472    md5sum
    14811473  FROM '.IMAGES_TABLE.'
    1482   WHERE md5sum IN (\''.implode("','", $md5sums).'\') 
     1474  WHERE md5sum IN (\''.implode("','", $md5sums).'\')
    14831475;';
    14841476  $id_of_md5 = simple_hash_from_query($query, 'md5sum', 'id');
    14851477
    14861478  $result = array();
    1487  
     1479
    14881480  foreach ($md5sums as $md5sum)
    14891481  {
Note: See TracChangeset for help on using the changeset viewer.