Changeset 11482 for freepbx/branches

Timestamp:

02/19/11 15:09:26 (2 years ago)

Author:

p_lindheimer

Message:

Merged revisions 11352-11464,11466-11479 via svnmerge from
http://www.freepbx.org/v2/svn/freepbx/branches/2.8
........

r11473 | p_lindheimer | 2011-02-19 10:48:07 -0800 (Sat, 19 Feb 2011) | 1 line

allow the versionupgrade module to block available upgrades so user can be presented with only the allowed modules. This enables controlling specific steps where more complicated upgrades would break if they don't follow the proper order.

........

Files:

• freepbx/branches/2.9 (modified) (1 prop)
• freepbx/branches/2.9/amp_conf/htdocs/admin/page.modules.php (modified) (1 diff)

freepbx/branches/2.9/amp_conf/htdocs/admin/page.modules.php

@@ -573 +573 @@
-      }
-
+      // If versionupgrade module is present then allow it to skip modules that should not be presented
+      // because and upgrade is in process. This can help assure only safe modules are present and
+      // force the user to upgrade in the proper order.
+      //
+      if (function_exists('versionupgrade_allowed_modules') && !versionupgrade_allowed_modules(&$modules[$name])) {
+        continue;
+      }
-      $numdisplayed++;
-