Changeset 11516

Show
Ignore:
Timestamp:
02/20/11 21:29:09 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 11515 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.8

........

r11515 | p_lindheimer | 2011-02-20 18:24:55 -0800 (Sun, 20 Feb 2011) | 1 line


fixes #4711 don't keep adding users

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.9

    • Property svnmerge-integrated changed from /modules/branches/2.8:1-11347,11372,11374,11376,11378 /modules/branches/bootstrap-2.9:1-10853 to /modules/branches/2.8:1-11347,11372,11374,11376,11378,11515 /modules/branches/bootstrap-2.9:1-10853

  • modules/branches/2.9/directory/functions.inc.php

    r11514 r11516  
    448448    return false; 
    449449  } 
    450   if ($value) { 
    451     sql("REPLACE INTO directory_entries (id, foreign_id) VALUES ($default_directory_id, '$extension')"); 
    452   } else { 
    453     sql("DELETE FROM directory_entries WHERE id = $default_directory_id AND foreign_id = '$extension'"); 
    454   } 
     450  if ($value) { 
     451    $entries = sql("SELECT COUNT(*) FROM directory_entries WHERE id = $default_directory_id AND foreign_id = '$extension'","getOne"); 
     452    if (!$entries) { 
     453      sql("INSERT INTO directory_entries (id, foreign_id) VALUES ($default_directory_id, '$extension')"); 
     454    } 
     455  } else { 
     456    sql("DELETE FROM directory_entries WHERE id = $default_directory_id AND foreign_id = '$extension'"); 
     457  } 
    455458} 
    456459