Changeset 3569

Show
Ignore:
Timestamp:
01/17/07 02:56:52 (6 years ago)
Author:
gregmac
Message:

Merged revisions 3567 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/freepbx/trunk

........

r3567 | gregmac | 2007-01-17 02:44:37 -0500 (Wed, 17 Jan 2007) | 2 lines


Fix #1694 - module_install() now returns true for already installed modules

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • freepbx/branches/2.2

    • Property svnmerge-integrated changed from /freepbx/trunk:1-3224,3231,3245-3246,3291-3295,3297,3299-3332,3336,3338-3365,3367-3373,3375-3388,3390-3391,3393-3395,3419 to /freepbx/trunk:1-3224,3231,3245-3246,3291-3295,3297,3299-3332,3336,3338-3365,3367-3373,3375-3388,3390-3391,3393-3395,3419,3567

  • freepbx/branches/2.2/amp_conf/htdocs/admin/functions.inc.php

    r3534 r3569  
    16811681   
    16821682    if (!in_array($modules[$modulename]['status'], array(MODULE_STATUS_NOTINSTALLED, MODULE_STATUS_NEEDUPGRADE))) { 
    1683       return array(_("This module is already installed.")); 
     1683      //return array(_("This module is already installed.")); 
     1684      // This isn't really an error, we just exit 
     1685      return true; 
    16841686    } 
    16851687