From d45a73777935c86fc5131955831833d7465b5e9d Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Mon, 21 Jan 2013 01:22:01 -0500
Subject: Update copyright to 2013.  Fixes #1953.

---
 modules/gallery/helpers/gallery.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/helpers/gallery.php')

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 8b118a80..38002b58 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -1,7 +1,7 @@
 <?php defined("SYSPATH") or die("No direct script access.");
 /**
  * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2012 Bharat Mediratta
+ * Copyright (C) 2000-2013 Bharat Mediratta
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
-- 
cgit v1.2.3


From a1a66004571c2f6161335f9413b39d255190f153 Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Wed, 23 Jan 2013 18:03:09 -0500
Subject: Enable the profiler and debug output if var/PROFILE exists.  This
 provides a quick/easy way for server admins to provide profile output. Fixes
 #1959.

---
 modules/gallery/helpers/gallery.php       | 8 ++++++++
 modules/gallery/helpers/gallery_theme.php | 4 ++--
 modules/gallery/libraries/MY_Database.php | 3 +++
 modules/rest/helpers/rest.php             | 2 +-
 4 files changed, 14 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/helpers/gallery.php')

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 38002b58..725a710d 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -214,4 +214,12 @@ class gallery_Core {
     }
     return null;
   }
+
+  /**
+   * Return true if we should show the profiler at the bottom of the page.  Note that this
+   * function is called at database setup time so it cannot rely on the database.
+   */
+  static function show_profiler() {
+    return file_exists(VARPATH . "PROFILE");
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/helpers/gallery_theme.php b/modules/gallery/helpers/gallery_theme.php
index f94b9ecd..3c6d71e9 100644
--- a/modules/gallery/helpers/gallery_theme.php
+++ b/modules/gallery/helpers/gallery_theme.php
@@ -71,7 +71,7 @@ class gallery_theme_Core {
 
   static function page_bottom($theme) {
     $session = Session::instance();
-    if ($session->get("profiler", false)) {
+    if (gallery::show_profiler()) {
       Profiler::enable();
       $profiler = new Profiler();
       $profiler->render();
@@ -96,7 +96,7 @@ class gallery_theme_Core {
 
   static function admin_page_bottom($theme) {
     $session = Session::instance();
-    if ($session->get("profiler", false)) {
+    if (gallery::show_profiler()) {
       Profiler::enable();
       $profiler = new Profiler();
       $profiler->render();
diff --git a/modules/gallery/libraries/MY_Database.php b/modules/gallery/libraries/MY_Database.php
index 604b6484..aae0bb79 100644
--- a/modules/gallery/libraries/MY_Database.php
+++ b/modules/gallery/libraries/MY_Database.php
@@ -32,6 +32,9 @@ abstract class Database extends Database_Core {
       $config["connection"]["params"] = null;
     }
     parent::__construct($config);
+    if (gallery::show_profiler()) {
+      $this->config['benchmark'] = true;
+    }
   }
 
   /**
diff --git a/modules/rest/helpers/rest.php b/modules/rest/helpers/rest.php
index eeedff2a..9b367feb 100644
--- a/modules/rest/helpers/rest.php
+++ b/modules/rest/helpers/rest.php
@@ -54,7 +54,7 @@ class rest_Core {
         $html = t("Empty response");
       }
       print "<pre>$html</pre>";
-      if (Session::instance()->get("profiler", false)) {
+      if (gallery::show_profiler()) {
         Profiler::enable();
         $profiler = new Profiler();
         $profiler->render();
-- 
cgit v1.2.3


From dece6dc5a5880c6267431ba3299c5758b38662ee Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 2 Feb 2013 23:39:16 -0500
Subject: Create gallery::allow_css_and_js_combining() which lets you disable
 combining CSS/JS by touching var/DONT_COMBINE.  Fixes #1989.

---
 modules/gallery/helpers/gallery.php        | 8 ++++++++
 modules/gallery/libraries/Gallery_View.php | 6 ++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/helpers/gallery.php')

diff --git a/modules/gallery/helpers/gallery.php b/modules/gallery/helpers/gallery.php
index 725a710d..f1f7190c 100644
--- a/modules/gallery/helpers/gallery.php
+++ b/modules/gallery/helpers/gallery.php
@@ -222,4 +222,12 @@ class gallery_Core {
   static function show_profiler() {
     return file_exists(VARPATH . "PROFILE");
   }
+
+  /**
+   * Return true if we should allow Javascript and CSS combining for performance reasons.
+   * Typically we want this, but it's convenient for developers to be able to disable it.
+   */
+  static function allow_css_and_js_combining() {
+    return !file_exists(VARPATH . "DONT_COMBINE");
+  }
 }
\ No newline at end of file
diff --git a/modules/gallery/libraries/Gallery_View.php b/modules/gallery/libraries/Gallery_View.php
index 64fea0ad..8f02b53c 100644
--- a/modules/gallery/libraries/Gallery_View.php
+++ b/modules/gallery/libraries/Gallery_View.php
@@ -82,8 +82,10 @@ class Gallery_View_Core extends View {
    * @param $types  a comma separated list of types to combine, eg "script,css"
    */
   public function start_combining($types) {
-    foreach (explode(",", $types) as $type) {
-      $this->combine_queue[$type] = array();
+    if (gallery::allow_css_and_js_combining()) {
+      foreach (explode(",", $types) as $type) {
+        $this->combine_queue[$type] = array();
+      }
     }
   }
 
-- 
cgit v1.2.3