Changeset 10873

Show
Ignore:
Timestamp:
01/09/11 12:49:48 (2 years ago)
Author:
p_lindheimer
Message:

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

................

r10871 | p_lindheimer | 2011-01-09 09:44:48 -0800 (Sun, 09 Jan 2011) | 9 lines


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


........

r10869 | p_lindheimer | 2011-01-09 09:42:21 -0800 (Sun, 09 Jan 2011) | 1 line


fixes #4735 bad warning alert box

........

................

r10872 | p_lindheimer | 2011-01-09 09:44:59 -0800 (Sun, 09 Jan 2011) | 1 line


Module Publish Script: conferences 2.8.0.4

................

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.9

    • Property svnmerge-integrated changed from /modules/branches/2.8:1-10838 /modules/branches/bootstrap-2.9:1-10853 to /modules/branches/2.8:1-10872 /modules/branches/bootstrap-2.9:1-10853

  • modules/branches/2.9/conferences/module.xml

    r10851 r10873  
    33  <repo>standard</repo> 
    44  <name>Conferences</name> 
    5   <version>2.8.0.3</version> 
     5  <version>2.8.0.4</version> 
    66  <publisher>FreePBX</publisher> 
    77  <license>GPLv2+</license> 
    …… 
    1010  <description>Allow creation of conference rooms (meet-me) where multiple people can talk together.</description> 
    1111  <changelog> 
     12    *2.8.0.4* #4735 
    1213    *2.8.0.3* #4697 
    1314    *2.8.0.2* #4660 
    …… 
    4748    <conferences>Conferences</conferences> 
    4849  </menuitems> 
    49   <location>release/2.8/conferences-2.8.0.3.tgz</location> 
    50   <md5sum>622cb17d51ba4be65b2132fc10b3f4a9</md5sum> 
     50  <location>release/2.8/conferences-2.8.0.4.tgz</location> 
     51  <md5sum>4eff3a0e6747e1f9cb7e94931032f3d9</md5sum> 
    5152</module> 

  • modules/branches/2.9/conferences/page.conferences.php

    r10756 r10873  
    2525 
    2626//check if the extension is within range for this user 
    27 if (isset($account) && !checkRange($account)){ 
     27if ($account != "" && !checkRange($account)){ 
    2828  echo "<script>javascript:alert('"._("Warning! Extension")." $account "._("is not allowed for your account.")."');</script>"; 
    2929} else {