Changeset 4226

Show
Ignore:
Timestamp:
06/26/07 17:55:08 (6 years ago)
Author:
p_lindheimer
Message:

#2025 really fix this time

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.3/core/functions.inc.php

    r4224 r4226  
    14621462  } 
    14631463   
     1464  $directdid=$vars['directdid']; 
     1465  $directdid = preg_replace("/[^0-9._XxNnZz\[\]\-]/" ,"", trim($directdid)); 
    14641466  // clean and check the did to make sure it is not being used by another extension or in did routing 
    14651467  // 
    14661468  if (trim($directdid) != "") { 
    1467     $directdid=$vars['directdid']; 
    1468     $directdid = preg_replace("/[^0-9._XxNnZz\[\]\-]/" ,"", trim($directdid)); 
    14691469    $existing=core_did_get($directdid,"",""); 
    14701470    $existing_directdid = empty($existing)?core_users_directdid_get($directdid):$existing; 
    1471     if (!empty($existing) || !empty($existing_directdid)) { 
     1471    if (!empty($existing) || (!empty($existing_directdid) && $existing_directdid['extension'] != $extension)) { 
    14721472      if (!empty($existing)) { 
    14731473        echo "<script>javascript:alert('"._("A route with this DID already exists:")." ".$existing['extension']."')</script>";