Changeset 4925

Show
Ignore:
Timestamp:
08/23/07 01:47:06 (6 years ago)
Author:
p_lindheimer
Message:

Merged revisions 4921,4923 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/modules/branches/2.3

........

r4921 | p_lindheimer | 2007-08-22 22:39:00 -0700 (Wed, 22 Aug 2007) | 1 line


#2305: Feature status reproting wrong status and inoperative

........

r4923 | p_lindheimer | 2007-08-22 22:42:51 -0700 (Wed, 22 Aug 2007) | 1 line


oops left debug statement in

........

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/branches/2.2

    • Property svnmerge-integrated changed from /modules/branches/2.1:1-2166,2289,2414,2419,2424,2430,2449,2458,2462,2476 /modules/branches/2.3:1-3256,4102,4227,4232,4251,4312,4390,4570,4574,4579,4583,4587,4595,4600,4751 to /modules/branches/2.1:1-2166,2289,2414,2419,2424,2430,2449,2458,2462,2476 /modules/branches/2.3:1-3256,4102,4227,4232,4251,4312,4390,4570,4574,4579,4583,4587,4595,4600,4751,4921,4923

  • modules/branches/2.2/miscapps/functions.inc.php

    r4596 r4925  
    112112} 
    113113 
    114 function miscapps_edit($miscapps_id, $description, $ext, $dest) {  
     114function miscapps_edit($miscapps_id, $description, $ext, $dest, $enabled=true) {  
    115115  global $db; 
    116116  $sql = "UPDATE miscapps SET ". 
    …… 
    127127  $fc->setDescription($description); 
    128128  $fc->setDefault($ext, true); 
     129  $fc->setEnabled($enabled); 
    129130  $fc->update(); 
    130131} 

  • modules/branches/2.2/miscapps/module.xml

    r4598 r4925  
    22  <rawname>miscapps</rawname> 
    33  <name>Misc Applications</name> 
    4   <version>0.2.0.3</version> 
     4  <version>0.2.0.4</version> 
    55  <type>setup</type> 
    66  <category>Internal Options &amp; Configuration</category> 
    …… 
    99  </description> 
    1010  <changelog> 
     11    *0.2.0.4* #2305 Feature Status broken 
    1112    *0.2.0.3* #2177: removed apparently corrupted newline at end of file 
    1213    *0.2.0.2* added proper uninstall, removes any feature codes and then table 

  • modules/branches/2.2/miscapps/page.miscapps.php

    r3485 r4925  
    3535  break; 
    3636  case 'edit': 
    37     miscapps_edit($miscapp_id, $description, $ext, $dest); 
     37    miscapps_edit($miscapp_id, $description, $ext, $dest, $enabled); 
    3838    needreload(); 
    3939    redirect_standard('extdisplay'); 
    …… 
    9898    <td><a href="#" class="info"><?php echo _("Feature Status")?>:<span><?php echo _("If this code is enabled or not.")?></span></a></td> 
    9999    <td><select name="enabled"> 
    100       <option value="1" <?php if ($enabled) echo "checked"; ?>>Enabled</option> 
    101       <option value="0" <?php if (!$enabled) echo "checked"; ?>>Disabled</option> 
     100      <option value="1" <?php if ($enabled) echo "SELECTED"; ?>>Enabled</option> 
     101      <option value="0" <?php if (!$enabled) echo "SELECTED"; ?>>Disabled</option> 
    102102    </select></td> 
    103103  </tr>