Merge branch 'master' into bharat_dev

1 files changed, 11 insertions, 5 deletions

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 1fafdef7..cbd9b33c 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -193,19 +193,25 @@ class gallery_Core {
    */
   static function version_string() {
     if (gallery::RELEASE_CHANNEL == "git") {
+      $build_number = gallery::build_number();
       return sprintf(
-        "%s (branch %s build %s)", gallery::VERSION, gallery::RELEASE_BRANCH,
-        gallery::build_number());
+        "%s (branch %s, %s)", gallery::VERSION, gallery::RELEASE_BRANCH,
+        $build_number ? " build $build_number" : "unknown build number");
     } else {
       return sprintf("%s (%s)", gallery::VERSION, gallery::CODE_NAME);
     }
   }
 
   /**
-   * Return the contents of the .build_number file, which should be a single integer.
+   * Return the contents of the .build_number file, which should be a single integer
+   * or return null if the .build_number file is missing.
    */
   static function build_number() {
-    $result = parse_ini_file(DOCROOT . ".build_number");
-    return $result["build_number"];
+    $build_file = DOCROOT . ".build_number";
+    if (file_exists($build_file))  {
+      $result = parse_ini_file(DOCROOT . ".build_number");
+      return $result["build_number"];
+    }
+    return null;
   }
 }
\ No newline at end of file