[dreamwidth/dw-free] 8170b5: Merge branch 'akpdw-bug5013-icon-metadata-vanishin...

[github]

Branch: refs/heads/develop
Home: https://github.com/dreamwidth/dw-free
Commit: 8170b5c8d02f587e8836b6e302bb9173d4065a9e
https://github.com/dreamwidth/dw-free/commit/8170b5c8d02f587e8836b6e302bb9173d4065a9e
Author: Afuna <fu@dreamwidth.org>
Date: 2013-06-11 (Tue, 11 Jun 2013)

Changed paths:
M htdocs/editicons.bml

Log Message:
-----------
Merge branch 'akpdw-bug5013-icon-metadata-vanishing' into release-1.16

* akpdw-bug5013-icon-metadata-vanishing:
(Bug 5013) Add flag to prevent overwriting newly active icons' metadata


Commit: bb7e44371aee386bb58b5ff0ebcd954f3d01b0b5
https://github.com/dreamwidth/dw-free/commit/bb7e44371aee386bb58b5ff0ebcd954f3d01b0b5
Author: exor674 <exor674@dreamwidth.org>
Date: 2013-06-14 (Fri, 14 Jun 2013)

Changed paths:
M cgi-bin/LJ/S2.pm
M cgi-bin/LJ/S2Theme.pm

Log Message:
-----------
Fix "Oops" on journals with deleted themes

Adding 'undef_if_missing' to avoid possibly
breaking other uses of this module.


Commit: fcf6b2ad1d9e16202f8c1ff41ce66df20bd03a9f
https://github.com/dreamwidth/dw-free/commit/fcf6b2ad1d9e16202f8c1ff41ce66df20bd03a9f
Author: Afuna <afunamatata+github@gmail.com>
Date: 2013-06-14 (Fri, 14 Jun 2013)

Changed paths:
M cgi-bin/LJ/S2.pm
M cgi-bin/LJ/S2Theme.pm

Log Message:
-----------
Merge pull request #442 from anall/hotfix/MissingTheme

Fix "Oops" on journals with deleted themes


Commit: f21d622965e5c20900fb3bb5834162deac6257ff
https://github.com/dreamwidth/dw-free/commit/f21d622965e5c20900fb3bb5834162deac6257ff
Author: Afuna <fu@dreamwidth.org>
Date: 2013-06-25 (Tue, 25 Jun 2013)

Changed paths:
M cgi-bin/LJ/S2.pm
M cgi-bin/LJ/S2Theme.pm

Log Message:
-----------
Merge branch 'release-1.16' into develop

* release-1.16:
Fix "Oops" on journals with deleted themes


Compare: https://github.com/dreamwidth/dw-free/compare/29df5e63a5ed...f21d622965e5

Comments

[turlough]

Fix "Oops" on journals with deleted themes

*snicker*