diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-02-03 18:56:38 -0500 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-02-03 18:56:38 -0500 |
| commit | bc99961305ca1bf229bc2d4ed952ab52c09fa3f4 (patch) | |
| tree | 0a17259e5e4ba39eda9381001140e762ca155608 | |
| parent | 0494244e8068198707bf602199413cd216b0d515 (diff) | |
| parent | 3439eb57006f6973bbcd17c9d2c13b1edf909f52 (diff) | |
Merge branch 'master' into jquery_190
| -rw-r--r-- | .build_number | 2 | ||||
| -rw-r--r-- | modules/g2_import/controllers/g2.php | 10 | ||||
| -rw-r--r-- | modules/gallery/tests/xss_data.txt | 22 |
3 files changed, 17 insertions, 17 deletions
diff --git a/.build_number b/.build_number index 2a71533d..5f471925 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=321 +build_number=324 diff --git a/modules/g2_import/controllers/g2.php b/modules/g2_import/controllers/g2.php index 3641b342..c9b1d182 100644 --- a/modules/g2_import/controllers/g2.php +++ b/modules/g2_import/controllers/g2.php @@ -46,7 +46,7 @@ class G2_Controller extends Controller { } if (!$id) { - url::redirect("tag_name/$tag_name"); + url::redirect("tag_name/$tag_name", 301); } $tag = ORM::factory("tag")->where("name", "=", $tag_name)->find(); @@ -99,18 +99,18 @@ class G2_Controller extends Controller { // Redirect the user to the new url switch ($resource_type) { case "thumbnail": - url::redirect($item->thumb_url(true)); + url::redirect($item->thumb_url(true), 301); case "resize": - url::redirect($item->resize_url(true)); + url::redirect($item->resize_url(true), 301); case "file": case "full": - url::redirect($item->file_url(true)); + url::redirect($item->file_url(true), 301); case "item": case "album": - url::redirect($item->abs_url()); + url::redirect($item->abs_url(), 301); case "group": case "user": diff --git a/modules/gallery/tests/xss_data.txt b/modules/gallery/tests/xss_data.txt index 4a7153e1..51347f86 100644 --- a/modules/gallery/tests/xss_data.txt +++ b/modules/gallery/tests/xss_data.txt @@ -299,17 +299,17 @@ modules/organize/views/organize_frame.html.php 116 DIRTY_JS url::s modules/organize/views/organize_frame.html.php 126 DIRTY_JS access::csrf_token() modules/organize/views/organize_frame.html.php 140 DIRTY_JS url::site("organize/delete") modules/organize/views/organize_frame.html.php 149 DIRTY_JS access::csrf_token() -modules/organize/views/organize_frame.html.php 262 DIRTY_JS url::site("organize/rearrange") -modules/organize/views/organize_frame.html.php 273 DIRTY_JS access::csrf_token() -modules/organize/views/organize_frame.html.php 312 DIRTY_JS $key -modules/organize/views/organize_frame.html.php 474 DIRTY_JS url::site("organize/tree/{$album->id}") -modules/organize/views/organize_frame.html.php 532 DIRTY_JS url::site("organize/reparent") -modules/organize/views/organize_frame.html.php 555 DIRTY_JS access::csrf_token() -modules/organize/views/organize_frame.html.php 571 DIRTY_JS access::can("edit",item::root()) -modules/organize/views/organize_frame.html.php 573 DIRTY_JS html::clean(item::root()->title) -modules/organize/views/organize_frame.html.php 575 DIRTY_JS item::root()->id -modules/organize/views/organize_frame.html.php 583 DIRTY_JS $album->id -modules/organize/views/organize_frame.html.php 584 DIRTY_JS $album->id +modules/organize/views/organize_frame.html.php 264 DIRTY_JS url::site("organize/rearrange") +modules/organize/views/organize_frame.html.php 275 DIRTY_JS access::csrf_token() +modules/organize/views/organize_frame.html.php 314 DIRTY_JS $key +modules/organize/views/organize_frame.html.php 476 DIRTY_JS url::site("organize/tree/{$album->id}") +modules/organize/views/organize_frame.html.php 534 DIRTY_JS url::site("organize/reparent") +modules/organize/views/organize_frame.html.php 557 DIRTY_JS access::csrf_token() +modules/organize/views/organize_frame.html.php 573 DIRTY_JS access::can("edit",item::root()) +modules/organize/views/organize_frame.html.php 575 DIRTY_JS html::clean(item::root()->title) +modules/organize/views/organize_frame.html.php 577 DIRTY_JS item::root()->id +modules/organize/views/organize_frame.html.php 585 DIRTY_JS $album->id +modules/organize/views/organize_frame.html.php 586 DIRTY_JS $album->id 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 3 DIRTY_ATTR request::protocol() |