Andy Staudacher a5dfc81a8f Merge commit 'upstream/master' ...

Conflicts:

	modules/akismet/views/admin_akismet.html.php
	modules/comment/helpers/comment_rss.php
	modules/gallery/helpers/gallery_rss.php
	modules/gallery/libraries/I18n.php
	modules/gallery/views/permissions_browse.html.php
	modules/gallery/views/simple_uploader.html.php
	modules/info/views/info_block.html.php
	modules/organize/controllers/organize.php
	modules/organize/views/organize.html.php
	modules/organize/views/organize_album.html.php
	themes/default/views/album.html.php
	themes/default/views/movie.html.php
	themes/default/views/photo.html.php

2009-08-29 14:17:48 -07:00

..

controllers

Redirect after success to the absolute url

2009-05-21 03:50:48 +00:00

helpers

Log the actual exception details, before swallowing the exception.

2009-08-29 08:47:44 -07:00

models

Gee it's May already. Update copyright to 2009.

2009-05-13 20:04:58 +00:00

views

Refactor all calls of p::clean() to SafeString::of() and p::purify() to SafeString::purify().

2009-08-29 12:48:40 -07:00

module.info

Add quotes around all values that contain spaces in them, and add a

2009-07-13 10:36:55 -07:00