Update version checking code to expect "branch_" as the prefix for

all branch related lines.  For #1605.

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/gallery/helpers/upgrade_checker.php b/modules/gallery/helpers/upgrade_checker.php
index ef1308d7..0e72bb94 100644
--- a/modules/gallery/helpers/upgrade_checker.php
+++ b/modules/gallery/helpers/upgrade_checker.php
@@ -93,14 +93,14 @@ class upgrade_checker_Core {
         }
       } else {
         $branch = gallery::RELEASE_BRANCH;
-        if (isset($version_info->data["{$branch}_build_number"]) &&
-            version_compare($version_info->data["{$branch}_build_number"],
+        if (isset($version_info->data["branch_{$branch}_build_number"]) &&
+            version_compare($version_info->data["branch_{$branch}_build_number"],
                             gallery::build_number(), ">")) {
           site_status::warning(
             t("A newer version of Gallery is available! <a href=\"%upgrade-url\">Upgrade now</a> to version %version (build %build on branch %branch) or <a href=\"%hide-url\">wait until later</a>.",
-              array("version" => $version_info->data["{$branch}_version"],
-                    "upgrade-url" => $version_info->data["{$branch}_upgrade_url"],
-                    "build" => $version_info->data["{$branch}_build_number"],
+              array("version" => $version_info->data["branch_{$branch}_version"],
+                    "upgrade-url" => $version_info->data["branch_{$branch}_upgrade_url"],
+                    "build" => $version_info->data["branch_{$branch}_build_number"],
                     "branch" => $branch,
                     "hide-url" => url::site("admin/upgrade_checker/remind_me_later?csrf=__CSRF__"))),
             "upgrade_checker");