Merge remote branch 'gallery3/master'

3 files changed, 54 insertions, 48 deletions

diff --git a/modules/gallery/tests/Item_Helper_Test.php b/modules/gallery/tests/Item_Helper_Test.php
index 00229973..eb2458cb 100644
--- a/modules/gallery/tests/Item_Helper_Test.php
+++ b/modules/gallery/tests/Item_Helper_Test.php
@@ -111,15 +111,18 @@ class Item_Helper_Test extends Gallery_Unit_Test_Case {
     $this->assert_not_same($rand, $photo2->slug);
   }
 
-  public function delete_cover_photo_picks_new_album_cover() {
-    $album = test::random_album();
+  public function delete_cover_photo_picks_new_album_cover_test() {
+    $parent = test::random_album();
+    $album = test::random_album($parent);
     $photo1 = test::random_photo($album);
     // At this point, $photo1 is the album cover.  We verify this in
     // Item_Model_Test::first_photo_becomes_album_cover
     $photo2 = test::random_photo($album);
     $photo1->delete();
     $album->reload();
+    $parent->reload();
 
     $this->assert_same($photo2->id, $album->album_cover_item_id);
+    $this->assert_same($photo2->id, $parent->album_cover_item_id);
   }
 }
diff --git a/modules/gallery/tests/controller_auth_data.txt b/modules/gallery/tests/controller_auth_data.txt
index 8263f79d..3c9b3afc 100644
--- a/modules/gallery/tests/controller_auth_data.txt
+++ b/modules/gallery/tests/controller_auth_data.txt
@@ -16,9 +16,9 @@ modules/gallery/controllers/login.php                        auth_html
 modules/gallery/controllers/logout.php                       index                DIRTY_AUTH
 modules/gallery/controllers/maintenance.php                  index                DIRTY_AUTH
 modules/gallery/controllers/quick.php                        form_edit            DIRTY_CSRF
-modules/gallery/controllers/simple_uploader.php              start                DIRTY_AUTH
-modules/gallery/controllers/simple_uploader.php              finish               DIRTY_AUTH
 modules/gallery/controllers/upgrader.php                     index                DIRTY_AUTH
+modules/gallery/controllers/uploader.php                     start                DIRTY_AUTH
+modules/gallery/controllers/uploader.php                     finish               DIRTY_AUTH
 modules/gallery/controllers/user_profile.php                 show                 DIRTY_AUTH
 modules/gallery/controllers/user_profile.php                 contact              DIRTY_AUTH
 modules/gallery/controllers/user_profile.php                 send                 DIRTY_AUTH
diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt
index 4ead8a3f..02483865 100644
--- a/modules/gallery/tests/xss_data.txt
+++ b/modules/gallery/tests/xss_data.txt
@@ -28,11 +28,11 @@ modules/comment/views/comment.mrss.php                       16  DIRTY_JS $feed-
 modules/comment/views/comment.mrss.php                       19  DIRTY_JS $feed->next_page_uri
 modules/comment/views/comment.mrss.php                       21  DIRTY    $pub_date
 modules/comment/views/comment.mrss.php                       22  DIRTY    $pub_date
-modules/comment/views/comment.mrss.php                       28  DIRTY    $child->item_uri
-modules/comment/views/comment.mrss.php                       29  DIRTY    $child->pub_date
-modules/comment/views/comment.mrss.php                       34  DIRTY_ATTR $child->thumb_url
-modules/comment/views/comment.mrss.php                       35  DIRTY_ATTR $child->thumb_height
-modules/comment/views/comment.mrss.php                       35  DIRTY_ATTR $child->thumb_width
+modules/comment/views/comment.mrss.php                       28  DIRTY    $comment->item_uri
+modules/comment/views/comment.mrss.php                       29  DIRTY    $comment->pub_date
+modules/comment/views/comment.mrss.php                       34  DIRTY_ATTR $comment->thumb_url
+modules/comment/views/comment.mrss.php                       35  DIRTY_ATTR $comment->thumb_height
+modules/comment/views/comment.mrss.php                       35  DIRTY_ATTR $comment->thumb_width
 modules/comment/views/comments.html.php                      28  DIRTY_ATTR $comment->id
 modules/comment/views/comments.html.php                      31  DIRTY_ATTR $comment->author()->avatar_url(40,$theme->url(,true))
 modules/comment/views/user_profile_comments.html.php         5   DIRTY_ATTR $comment->id
@@ -76,7 +76,7 @@ modules/gallery/views/admin_languages.html.php               61  DIRTY_ATTR ($de
 modules/gallery/views/admin_languages.html.php               62  DIRTY    form::checkbox("installed_locales[]",$code,isset($installed_locales[$code]))
 modules/gallery/views/admin_languages.html.php               63  DIRTY    $display_name
 modules/gallery/views/admin_languages.html.php               65  DIRTY    form::radio("default_locale",$code,($default_locale==$code),((isset($installed_locales[$code]))?'':'disabled="disabled"'))
-modules/gallery/views/admin_languages.html.php               110 DIRTY    $share_translations_form
+modules/gallery/views/admin_languages.html.php               113 DIRTY    $share_translations_form
 modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR text::alternate("g-odd","g-even")
 modules/gallery/views/admin_maintenance.html.php             24  DIRTY_ATTR log::severity_class($task->severity)
 modules/gallery/views/admin_maintenance.html.php             25  DIRTY_ATTR log::severity_class($task->severity)
@@ -109,7 +109,7 @@ modules/gallery/views/admin_sidebar.html.php                 50  DIRTY    $avail
 modules/gallery/views/admin_sidebar.html.php                 58  DIRTY    $active
 modules/gallery/views/admin_sidebar_blocks.html.php          4   DIRTY_ATTR $ref
 modules/gallery/views/admin_sidebar_blocks.html.php          4   DIRTY    $text
-modules/gallery/views/admin_theme_options.html.php           6   DIRTY    $form
+modules/gallery/views/admin_theme_options.html.php           36  DIRTY    $form
 modules/gallery/views/admin_themes.html.php                  3   DIRTY_JS url::site("admin/themes/choose")
 modules/gallery/views/admin_themes.html.php                  5   DIRTY_JS $csrf
 modules/gallery/views/admin_themes.html.php                  22  DIRTY    $themes[$site]->name
@@ -120,7 +120,7 @@ modules/gallery/views/admin_themes.html.php                  60  DIRTY    $theme
 modules/gallery/views/admin_themes.html.php                  62  DIRTY    $themes[$admin]->description
 modules/gallery/views/admin_themes.html.php                  76  DIRTY    $info->name
 modules/gallery/views/admin_themes.html.php                  78  DIRTY    $info->description
-modules/gallery/views/admin_themes_preview.html.php          7   DIRTY_ATTR $url
+modules/gallery/views/admin_themes_preview.html.php          8   DIRTY_ATTR $url
 modules/gallery/views/error_404.html.php                     14  DIRTY    $login_form
 modules/gallery/views/error_admin.html.php                   150 DIRTY    $type
 modules/gallery/views/error_admin.html.php                   150 DIRTY    $code
@@ -167,7 +167,7 @@ modules/gallery/views/error_admin.html.php                   251 DIRTY_ATTR $env
 modules/gallery/views/error_admin.html.php                   257 DIRTY    $key
 modules/gallery/views/error_admin.html.php                   261 DIRTY    Kohana_Exception::safe_dump($value,$key)
 modules/gallery/views/form_uploadify.html.php                9   DIRTY_JS url::file("lib/uploadify/uploadify.swf")
-modules/gallery/views/form_uploadify.html.php                10  DIRTY_JS url::site("simple_uploader/add_photo/{$album->id}")
+modules/gallery/views/form_uploadify.html.php                10  DIRTY_JS url::site("uploader/add_photo/{$album->id}")
 modules/gallery/views/form_uploadify.html.php                14  DIRTY_JS url::file("lib/uploadify/cancel.png")
 modules/gallery/views/form_uploadify.html.php                15  DIRTY_JS $simultaneous_upload_limit
 modules/gallery/views/in_place_edit.html.php                 2   DIRTY    form::open($action,array("method"=>"post","id"=>"g-in-place-edit-form","class"=>"g-short-form"))
@@ -190,7 +190,7 @@ modules/gallery/views/l10n_client.html.php                   58  DIRTY    form::
 modules/gallery/views/l10n_client.html.php                   62  DIRTY    form::textarea("l10n-edit-plural-translation-many","",' rows="2"')
 modules/gallery/views/l10n_client.html.php                   67  DIRTY    form::textarea("l10n-edit-plural-translation-other","",' rows="2"')
 modules/gallery/views/login_ajax.html.php                    6   DIRTY_JS url::site("password/reset")
-modules/gallery/views/login_ajax.html.php                    37  DIRTY    $form
+modules/gallery/views/login_ajax.html.php                    44  DIRTY    $form
 modules/gallery/views/maintenance.html.php                   46  DIRTY    auth::get_login_form("login/auth_html")
 modules/gallery/views/menu.html.php                          4   DIRTY    $menu->css_id?"id='$menu->css_id'":""
 modules/gallery/views/menu.html.php                          4   DIRTY_ATTR $menu->css_class
@@ -206,9 +206,9 @@ modules/gallery/views/menu_dialog.html.php                   5   DIRTY_JS $menu-
 modules/gallery/views/menu_link.html.php                     3   DIRTY    $menu->css_id?"id='{$menu->css_id}'":""
 modules/gallery/views/menu_link.html.php                     4   DIRTY_ATTR $menu->css_class
 modules/gallery/views/menu_link.html.php                     5   DIRTY_JS $menu->url
-modules/gallery/views/move_browse.html.php                   4   DIRTY_JS url::site("move/show_sub_tree/{$source->id}/__TARGETID__")
-modules/gallery/views/move_browse.html.php                   39  DIRTY    $tree
-modules/gallery/views/move_browse.html.php                   43  DIRTY    access::csrf_form_field()
+modules/gallery/views/move_browse.html.php                   5   DIRTY_JS url::site("move/show_sub_tree/{$source->id}/__TARGETID__")
+modules/gallery/views/move_browse.html.php                   40  DIRTY    $tree
+modules/gallery/views/move_browse.html.php                   44  DIRTY    access::csrf_form_field()
 modules/gallery/views/move_tree.html.php                     2   DIRTY    $parent->thumb_img(array(),25);
 modules/gallery/views/move_tree.html.php                     4   DIRTY_JS $parent->id
 modules/gallery/views/move_tree.html.php                     6   DIRTY_JS $parent->id
@@ -253,15 +253,16 @@ modules/gallery/views/permissions_form.html.php              75  DIRTY_JS $item-
 modules/gallery/views/permissions_form.html.php              80  DIRTY_JS $group->id
 modules/gallery/views/permissions_form.html.php              80  DIRTY_JS $permission->id
 modules/gallery/views/permissions_form.html.php              80  DIRTY_JS $item->id
+modules/gallery/views/quick_delete_confirm.html.php          11  DIRTY    $form
 modules/gallery/views/reauthenticate.html.php                9   DIRTY    $form
-modules/gallery/views/upgrader.html.php                      57  DIRTY_ATTR $done?"muted":""
-modules/gallery/views/upgrader.html.php                      61  DIRTY_ATTR $done?"muted":""
-modules/gallery/views/upgrader.html.php                      69  DIRTY_ATTR $module->version==$module->code_version?"current":"upgradeable"
-modules/gallery/views/upgrader.html.php                      70  DIRTY_ATTR $id
-modules/gallery/views/upgrader.html.php                      74  DIRTY    $module->version
-modules/gallery/views/upgrader.html.php                      77  DIRTY    $module->code_version
-modules/gallery/views/upgrader.html.php                      99  DIRTY_ATTR $done?"muted":""
-modules/gallery/views/upgrader.html.php                      102 DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      59  DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      63  DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      71  DIRTY_ATTR $module->version==$module->code_version?"current":"upgradeable"
+modules/gallery/views/upgrader.html.php                      72  DIRTY_ATTR $id
+modules/gallery/views/upgrader.html.php                      76  DIRTY    $module->version
+modules/gallery/views/upgrader.html.php                      79  DIRTY    $module->code_version
+modules/gallery/views/upgrader.html.php                      101 DIRTY_ATTR $done?"muted":""
+modules/gallery/views/upgrader.html.php                      104 DIRTY_ATTR $done?"muted":""
 modules/gallery/views/user_languages_block.html.php          2   DIRTY    form::dropdown("g-select-session-locale",$installed_locales,$selected)
 modules/gallery/views/user_profile.html.php                  34  DIRTY_ATTR $user->avatar_url(40,$theme->url(,true))
 modules/gallery/views/user_profile.html.php                  43  DIRTY    $info->view
@@ -288,7 +289,9 @@ modules/organize/views/organize_dialog.html.php              95  DIRTY_JS $sort_
 modules/organize/views/organize_dialog.html.php              96  DIRTY_JS $album->id
 modules/organize/views/organize_dialog.html.php              97  DIRTY_JS $rest_uri
 modules/organize/views/organize_dialog.html.php              98  DIRTY_JS $controller_uri
+modules/organize/views/organize_dialog.html.php              104 DIRTY_JS $flash_minimum_version="10.0.0"
 modules/organize/views/organize_dialog.html.php              122 DIRTY_JS $swf_uri
+modules/organize/views/organize_dialog.html.php              136 DIRTY_ATTR request::protocol()
 modules/recaptcha/views/admin_recaptcha.html.php             11  DIRTY    $form
 modules/recaptcha/views/admin_recaptcha.html.php             23  DIRTY_JS $public_key
 modules/recaptcha/views/form_recaptcha.html.php              7   DIRTY_JS $public_key
@@ -298,26 +301,26 @@ modules/rss/views/feed.mrss.php                              16  DIRTY_JS $feed-
 modules/rss/views/feed.mrss.php                              19  DIRTY_JS $feed->next_page_uri
 modules/rss/views/feed.mrss.php                              21  DIRTY    $pub_date
 modules/rss/views/feed.mrss.php                              22  DIRTY    $pub_date
-modules/rss/views/feed.mrss.php                              28  DIRTY    date("D, d M Y H:i:s T",$child->created);
-modules/rss/views/feed.mrss.php                              35  DIRTY_ATTR $child->resize_url(true)
-modules/rss/views/feed.mrss.php                              37  DIRTY_ATTR $child->resize_height
-modules/rss/views/feed.mrss.php                              37  DIRTY_ATTR $child->resize_width
-modules/rss/views/feed.mrss.php                              40  DIRTY_ATTR $child->thumb_url(true)
-modules/rss/views/feed.mrss.php                              42  DIRTY_ATTR $child->thumb_height
-modules/rss/views/feed.mrss.php                              42  DIRTY_ATTR $child->thumb_width
-modules/rss/views/feed.mrss.php                              48  DIRTY_ATTR $child->thumb_url(true)
-modules/rss/views/feed.mrss.php                              49  DIRTY_ATTR $child->thumb_height
-modules/rss/views/feed.mrss.php                              50  DIRTY_ATTR $child->thumb_width
-modules/rss/views/feed.mrss.php                              57  DIRTY_ATTR $child->resize_url(true)
-modules/rss/views/feed.mrss.php                              58  DIRTY_ATTR @filesize($child->resize_path())
-modules/rss/views/feed.mrss.php                              59  DIRTY_ATTR $child->mime_type
-modules/rss/views/feed.mrss.php                              60  DIRTY_ATTR $child->resize_height
-modules/rss/views/feed.mrss.php                              61  DIRTY_ATTR $child->resize_width
-modules/rss/views/feed.mrss.php                              65  DIRTY_ATTR $child->file_url(true)
-modules/rss/views/feed.mrss.php                              66  DIRTY_ATTR @filesize($child->file_path())
-modules/rss/views/feed.mrss.php                              67  DIRTY_ATTR $child->mime_type
-modules/rss/views/feed.mrss.php                              68  DIRTY_ATTR $child->height
-modules/rss/views/feed.mrss.php                              69  DIRTY_ATTR $child->width
+modules/rss/views/feed.mrss.php                              28  DIRTY    date("D, d M Y H:i:s T",$item->created);
+modules/rss/views/feed.mrss.php                              35  DIRTY_ATTR $item->resize_url(true)
+modules/rss/views/feed.mrss.php                              37  DIRTY_ATTR $item->resize_height
+modules/rss/views/feed.mrss.php                              37  DIRTY_ATTR $item->resize_width
+modules/rss/views/feed.mrss.php                              40  DIRTY_ATTR $item->thumb_url(true)
+modules/rss/views/feed.mrss.php                              42  DIRTY_ATTR $item->thumb_height
+modules/rss/views/feed.mrss.php                              42  DIRTY_ATTR $item->thumb_width
+modules/rss/views/feed.mrss.php                              48  DIRTY_ATTR $item->thumb_url(true)
+modules/rss/views/feed.mrss.php                              49  DIRTY_ATTR $item->thumb_height
+modules/rss/views/feed.mrss.php                              50  DIRTY_ATTR $item->thumb_width
+modules/rss/views/feed.mrss.php                              57  DIRTY_ATTR $item->resize_url(true)
+modules/rss/views/feed.mrss.php                              58  DIRTY_ATTR @filesize($item->resize_path())
+modules/rss/views/feed.mrss.php                              59  DIRTY_ATTR $item->mime_type
+modules/rss/views/feed.mrss.php                              60  DIRTY_ATTR $item->resize_height
+modules/rss/views/feed.mrss.php                              61  DIRTY_ATTR $item->resize_width
+modules/rss/views/feed.mrss.php                              65  DIRTY_ATTR $item->file_url(true)
+modules/rss/views/feed.mrss.php                              66  DIRTY_ATTR @filesize($item->file_path())
+modules/rss/views/feed.mrss.php                              67  DIRTY_ATTR $item->mime_type
+modules/rss/views/feed.mrss.php                              68  DIRTY_ATTR $item->height
+modules/rss/views/feed.mrss.php                              69  DIRTY_ATTR $item->width
 modules/rss/views/rss_block.html.php                         6   DIRTY_JS rss::url($url)
 modules/search/views/search.html.php                         27  DIRTY_ATTR $item_class
 modules/search/views/search.html.php                         28  DIRTY_JS $item->url()
@@ -406,9 +409,9 @@ themes/wind/views/page.html.php                              81  DIRTY    $heade
 themes/wind/views/page.html.php                              83  DIRTY_JS item::root()->url()
 themes/wind/views/page.html.php                              87  DIRTY    $theme->user_menu()
 themes/wind/views/page.html.php                              108 DIRTY_JS $parent->url($parent==$theme->item()->parent()?"show={$theme->item()->id}":null)
-themes/wind/views/page.html.php                              124 DIRTY    $content
-themes/wind/views/page.html.php                              130 DIRTY    newView("sidebar.html")
-themes/wind/views/page.html.php                              137 DIRTY    $footer_text
+themes/wind/views/page.html.php                              126 DIRTY    $content
+themes/wind/views/page.html.php                              132 DIRTY    newView("sidebar.html")
+themes/wind/views/page.html.php                              139 DIRTY    $footer_text
 themes/wind/views/paginator.html.php                         33  DIRTY_JS $first_page_url
 themes/wind/views/paginator.html.php                         42  DIRTY_JS $previous_page_url
 themes/wind/views/paginator.html.php                         70  DIRTY_JS $next_page_url