Changeset 2024

Show
Ignore:
Timestamp:
06/04/06 03:02:40 (7 years ago)
Author:
qldrob
Message:

Merged revisions 2009-2023 via svnmerge from
https://svn.sourceforge.net/svnroot/amportal/freepbx/branches/2.1

........

r2010 | qldrob | 2006-06-04 10:36:01 +1000 (Sun, 04 Jun 2006) | 2 lines


More svnmerge.py goodness.

........

r2023 | qldrob | 2006-06-04 16:53:38 +1000 (Sun, 04 Jun 2006) | 2 lines


Fix quietmode still outputting stuff in the footer

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • freepbx/trunk

    • Property svnmerge-integrated changed from /freepbx/branches/2.1:1-2009 to /freepbx/branches/2.1:1-2023
  • freepbx/trunk/amp_conf/htdocs/admin/footer.php

    r1738 r2024  
    2020    die($need_reload->getMessage()); 
    2121  } 
    22 ?> 
    23 <?php   
    24  
    2522//check to see if we are requesting an asterisk reload 
    2623if (isset($_REQUEST['clk_reload'])) { 
     
    109106  } 
    110107} 
     108 
     109if (!$quietmode) { 
    111110?> 
    112111     
     
    134133    <br> 
    135134    </span> 
     135<?php  
     136} 
     137?> 
    136138</div> 
    137139