diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2009-07-02 18:00:22 -0700 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2009-07-02 18:00:22 -0700 |
| commit | eb5538d1357dade9e6e08d1b603033928944011c (patch) | |
| tree | ee04f9be38a40f4125eafab5367bba6cf1b61164 /modules/digibug/controllers | |
| parent | 1a5fe42b555d51d22bde1521100a31d2b434486b (diff) | |
| parent | a633c134b754305eaa611c5d67af4ca7c79beafe (diff) | |
Merge branch 'master' of git@github.com:/gallery/gallery3
Conflicts:
modules/server_add/controllers/admin_server_add.php
Diffstat (limited to 'modules/digibug/controllers')
| -rw-r--r-- | modules/digibug/controllers/digibug.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/digibug/controllers/digibug.php b/modules/digibug/controllers/digibug.php index c1852009..49fb51ad 100644 --- a/modules/digibug/controllers/digibug.php +++ b/modules/digibug/controllers/digibug.php @@ -41,6 +41,7 @@ class Digibug_Controller extends Controller { "company_id" => module::get_var("digibug", "company_id"), "event_id" => module::get_var("digibug", "event_id"), "cmd" => "addimg", + "partner_code" => "69", "return_url" => url::abs_site("digibug/close_window"), "num_images" => "1", "image_1" => $full_url, @@ -55,7 +56,7 @@ class Digibug_Controller extends Controller { } public function print_proxy($type, $id) { - $proxy = ORM::factory("digibug_proxy", array("uuid", $id)); + $proxy = ORM::factory("digibug_proxy", array("uuid" => $id)); if (!$proxy->loaded || !$proxy->item->loaded) { Kohana::show_404(); } |