Merge commit 'upstream/master'

Conflicts:

	modules/comment/helpers/comment_installer.php
	modules/gallery/models/item.php

1 files changed, 22 insertions, 0 deletions

diff --git a/modules/digibug/models/proxy.php b/modules/digibug/models/proxy.php
new file mode 100644
index 00000000..ce10c592
--- /dev/null
+++ b/modules/digibug/models/proxy.php
@@ -0,0 +1,22 @@
+<?php defined("SYSPATH") or die("No direct script access.");
+/**
+ * Gallery - a web based photo album viewer and editor
+ * Copyright (C) 2000-2009 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
+ * the Free Software Foundation; either version 2 of the License, or (at
+ * your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
+ */
+class Proxy_Model extends ORM {
+  protected $has_one = array("item");
+}