stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-29 19:20:52 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jquery_190

Browse Source
This commit is contained in:
Bharat Mediratta
2013-02-03 18:56:38 -05:00
parent 0494244e80 3439eb5700
commit bc99961305
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.build_number
+1 -1
View File
@@ -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
modules/g2_import/controllers/g2.php
+5 -5
View File
@@ -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":
modules/gallery/tests/xss_data.txt
+11 -11
View File
@@ -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()