diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2010-01-23 16:29:10 -0800 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2010-01-23 16:29:10 -0800 |
| commit | fecac4a8596a69088270e48a90868e845fc8f4ca (patch) | |
| tree | a4683906d481d1091e218c9b6662a1997cb11086 /modules/slideshow/helpers | |
| parent | 8849594aa17768f564e45370a62f01e440570dcf (diff) | |
| parent | 3b16d0662b8a4b06f4be72165c858a1231e9bd67 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev
Conflicts:
modules/gallery/tests/xss_data.txt
Diffstat (limited to 'modules/slideshow/helpers')
| -rw-r--r-- | modules/slideshow/helpers/slideshow_installer.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/slideshow/helpers/slideshow_installer.php b/modules/slideshow/helpers/slideshow_installer.php index 319e2e79..8d612f3e 100644 --- a/modules/slideshow/helpers/slideshow_installer.php +++ b/modules/slideshow/helpers/slideshow_installer.php @@ -34,7 +34,7 @@ class slideshow_installer { site_status::clear("slideshow_needs_rss"); } - static function check_environment() { + static function can_activate() { $messages = array(); if (!module::is_active("rss")) { $messages["warn"][] = t("The Slideshow module requires the RSS module."); |