diff options
| author | Chad Parry <github@chad.parry.org> | 2011-07-21 00:11:52 -0600 |
|---|---|---|
| committer | Chad Parry <github@chad.parry.org> | 2011-07-21 00:11:52 -0600 |
| commit | 44b624f6fbc34cbc638afa1c2a1f6cb0ae154a03 (patch) | |
| tree | acc42ae84a9f3631225e122a5339e10998e66f81 /modules/gallery/views | |
| parent | 521a682837ab5b035d63160ea7b22540f3adf7b1 (diff) | |
Squashed commit of the following:
commit 41d379c2b777ae7b3a11f528971228e234f8976f
Author: Chad Parry <github@chad.parry.org>
Date: Thu Jul 21 00:10:10 2011 -0600
Replace an overly-complicated regular expression with a simple in_array, at Bharat's suggestion.
commit 1b3f7111d4c2607baaa2da0aab3b501f2d9a1426
Merge: 8f7904a 403f64b
Author: Chad Parry <github@chad.parry.org>
Date: Wed Jul 20 21:02:56 2011 -0600
Merge branch 'master' into rawphoto
commit 403f64bf2a91fe3ac2496a0a6a6180ece26afd82
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date: Tue Jul 12 21:44:14 2011 -0700
Automated update of .build_number to 163 for branch master
Last update: e8382b960a3c19bb28140833e348e6c9c9db8a8a (1 commits ago)
commit 51726f9e4b8372c40b27f843fca7b783e6db9623
Author: Tim Almdal <tnalmdal@shaw.ca>
Date: Tue Jul 12 21:44:40 2011 -0700
Fix for ticket #1752. Add an RSS field link for the current album. Or, in the case of a photo or movie, add a link to the rss field of the parent album.
commit e8382b960a3c19bb28140833e348e6c9c9db8a8a
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date: Mon Jun 27 22:27:04 2011 -0700
Automated update of .build_number to 162 for branch master
Last update: 40cda7fa3fa8d9ede1f24bfa8460aab1ac681c34 (1 commits ago)
commit 1afbcafe0e556ac571a5282f8b481fb90f5fb05a
Merge: 40cda7f fc6c139
Author: Bharat Mediratta <bharat@menalto.com>
Date: Mon Jun 27 22:26:41 2011 -0700
Merge pull request #56 from alindeman/alindeman/1758
[Fixes #1758] Link to themes codex page instead of modules codex page
commit 40cda7fa3fa8d9ede1f24bfa8460aab1ac681c34
Author: Automatic Build Number Updater <bharat+gallery3_build_number_updater@menalto.com>
Date: Mon Jun 27 22:25:54 2011 -0700
Automated update of .build_number to 161 for branch master
Last update: 771de0a3746ac0d780cb5dce2a14aa5a6ddf06d7 (1 commits ago)
commit aa08df7f0a839c95d268853cd745f622c98cadd0
Merge: 771de0a 784c429
Author: Bharat Mediratta <bharat@menalto.com>
Date: Mon Jun 27 22:25:46 2011 -0700
Merge pull request #55 from alindeman/alindeman/1757
[Fixes #1757] Redirect to root album if path comes in as main.php or index.php
commit fc6c1390d3d5f3d99d75b04acf208ae3729c11ce
Author: Andy Lindeman <alindeman@gmail.com>
Date: Mon Jun 27 08:25:50 2011 -0400
[Fixes #1758] Link to themes codex page instead of modules codex page
commit 784c429070db54e183feb3e0ea6f2726b6507081
Author: Andy Lindeman <alindeman@gmail.com>
Date: Mon Jun 27 07:24:37 2011 -0400
[Fixes #1757] Redirect to root album if path comes in as main.php or index.php
commit 8f7904ab62c71a7e4ee68762f936030b4dcb4ea1
Merge: e950573 771de0a
Author: Chad Parry <github@chad.parry.org>
Date: Sat Jun 25 14:12:39 2011 -0600
Merge branches 'master' and 'rawphoto' into rawphoto
commit e95057337996351e49915d9f85d007d50103a4be
Author: Chad Parry <github@chad.parry.org>
Date: Wed Jun 15 20:24:18 2011 -0600
Merge branches 'rawphoto-squash' and 'rawphoto' into rawphoto
Diffstat (limited to 'modules/gallery/views')
| -rw-r--r-- | modules/gallery/views/admin_themes.html.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/gallery/views/admin_themes.html.php b/modules/gallery/views/admin_themes.html.php index 7d947b28..9d53779f 100644 --- a/modules/gallery/views/admin_themes.html.php +++ b/modules/gallery/views/admin_themes.html.php @@ -48,7 +48,7 @@ <? if (!$count): ?> <p> - <?= t("There are no other site themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Modules")) ?> + <?= t("There are no other site themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Themes")) ?> </p> <? endif ?> </div> @@ -88,7 +88,7 @@ <? if (!$count): ?> <p> - <?= t("There are no other admin themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Modules")) ?> + <?= t("There are no other admin themes available. <a href=\"%url\">Download one now!</a>", array("url" => "http://codex.gallery2.org/Category:Gallery_3:Themes")) ?> </p> <? endif ?> </div> |