Merge remote branch 'gallery3/master'

Conflicts:
	themes/admin_wind/css/screen.css
	themes/wind/css/screen.css

1 files changed, 13 insertions, 0 deletions

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index ca8c92c9..3cf0eacd 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -140,4 +140,17 @@ class gallery_Core {
     return $file_name;
   }
 
+  /**
+   * Set the PATH environment variable to the paths specified.
+   * @param  array   Array of paths.  Each array entry can contain a colon separated list of paths.
+   */
+  static function set_path_env($paths) {
+    $path_env = array();
+    foreach ($paths as $path) {
+      if ($path) {
+        array_push($path_env, $path);
+      }
+    }
+    putenv("PATH=" .  implode(":", $path_env));
+  }
 }
\ No newline at end of file