[gallery/gallery3] 9ef891: Protect admins from themselves - in case an admin ...

GitHub <noreply-9UaJU3cA/F/[email protected]>
Newsgroups gmane.comp.web.gallery.cvs
Message-ID <[email protected]>
  Branch: refs/heads/master
  Home:   https://github.com/gallery/gallery3
  Commit: 9ef891858ca6ccf4213c5981868c6175cb2cde47
      https://github.com/gallery/gallery3/commit/9ef891858ca6ccf4213c5981868c6175cb2cde47
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M modules/watermark/controllers/admin_watermarks.php

  Log Message:
  -----------
  Protect admins from themselves - in case an admin changed the
watermark.name setting to something terrible by accident via Admin >
Advanced, we'll just use the basename.  Fixes #1977.


  Commit: ee0a0d7bf7ef6ae05a8961f8a956871a8c7bf371
      https://github.com/gallery/gallery3/commit/ee0a0d7bf7ef6ae05a8961f8a956871a8c7bf371
  Author: Bharat Mediratta <[email protected]>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M .build_number

  Log Message:
  -----------
  Merge branch 'master' of github.com:gallery/gallery3


Compare: https://github.com/gallery/gallery3/compare/8ada16d887e0...ee0a0d7bf7ef

------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan

__[ g a l l e r y - c h e c k i n s ]_________________________

[ list info/archive --> http://gallery.sf.net/lists.php ]
[ gallery info/FAQ/download --> http://gallery.sf.net ]
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.