Changeset 5206

Show
Ignore:
Timestamp:
11/03/07 13:33:28 (1 year ago)
Author:
p_lindheimer
Message:

Merged revisions 5205 via svnmerge from
http://svn.freepbx.org/modules/branches/2.3

........

r5205 | p_lindheimer | 2007-11-03 13:32:23 -0700 (Sat, 03 Nov 2007) | 1 line


correct bug fix from blank user's being entered

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.4

    • Property svnmerge-integrated changed from /modules/branches/2.3:1-5080,5111,5128,5130,5155,5157,5159,5163,5165,5186-5188,5190,5192,5194-5196 to /modules/branches/2.3:1-5080,5111,5128,5130,5155,5157,5159,5163,5165,5186-5188,5190,5192,5194-5196,5205

  • modules/branches/2.4/core/functions.inc.php

    r5197 r5206  
    13381338        $thisexten = isset($thisexten) ? $thisexten : ''; 
    13391339 
    1340         if (trim($thisexten) == '' ) { 
     1340        if (trim($extension) == '' ) { 
    13411341                echo "<script>javascript:alert('"._("You must put in an extension (or user) number")."');</script>"; 
    13421342                return false; 
    …… 
    13481348                foreach($extens as $exten) { 
    13491349                        if ($exten[0]===$extension) { 
    1350                                 echo "<script>javascript:alert('"._("This user")." ({$thisexten}) "._("or extension")." ({$extension}) "._("is already in use")."');</script>"; 
     1350                                echo "<script>javascript:alert('".sprintf(_("This user/extension %s is already in use"),$extension)."');</script>"; 
    13511351                                return false; 
    13521352                        }