Fixes #2452. Removed the first admin installation notice. It was just a reminder...

git-svn-id: http://code.elgg.org/elgg/trunk@8380 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/actions/admin/plugins/activate.php b/actions/admin/plugins/activate.php
index 7a55cb7bb6e5be0851b417b92b472677e9e2e521..822d09f43dc079b4de09a2e4125d7a213c07eac7 100644 (file)
--- a/actions/admin/plugins/activate.php
+++ b/actions/admin/plugins/activate.php
@@ -32,8 +32,6 @@ foreach ($plugin_guids as $guid) {
        }
 }
 
-elgg_delete_admin_notice('first_installation_plugin_reminder');
-
 // don't regenerate the simplecache because the plugin won't be
 // loaded until next run.  Just invalidate and let it regnerate as needed
 elgg_invalidate_simplecache();

diff --git a/actions/admin/plugins/activate_all.php b/actions/admin/plugins/activate_all.php
index 4ba4be270562b5e9f1bab6c68a0a88ee8385d8b0..25802ce2ee2b4b7edd8b7e9014121ce1d46eaa15 100644 (file)
--- a/actions/admin/plugins/activate_all.php
+++ b/actions/admin/plugins/activate_all.php
@@ -19,8 +19,6 @@ foreach ($plugins as $plugin) {
        }
 }
 
-elgg_delete_admin_notice('first_installation_plugin_reminder');
-
 // don't regenerate the simplecache because the plugin won't be
 // loaded until next run.  Just invalidate and let it regnerate as needed
 elgg_invalidate_simplecache();

diff --git a/actions/admin/plugins/deactivate.php b/actions/admin/plugins/deactivate.php
index 7a9d59287b8605e25030adbfef99e2a66588d391..24ab38501fd4bcbf0bf9bc64a6a81e7457ca5cf7 100644 (file)
--- a/actions/admin/plugins/deactivate.php
+++ b/actions/admin/plugins/deactivate.php
@@ -32,8 +32,6 @@ foreach ($plugin_guids as $guid) {
        }
 }
 
-elgg_delete_admin_notice('first_installation_plugin_reminder');
-
 // don't regenerate the simplecache because the plugin won't be
 // loaded until next run.  Just invalidate and let it regnerate as needed
 elgg_invalidate_simplecache();

diff --git a/actions/admin/plugins/deactivate_all.php b/actions/admin/plugins/deactivate_all.php
index bdeda001f5f082b589571f0115c1aa8558d45e21..f1bea0a2c70374b349c5865d448198eb1d9b9fdf 100644 (file)
--- a/actions/admin/plugins/deactivate_all.php
+++ b/actions/admin/plugins/deactivate_all.php
@@ -19,8 +19,6 @@ foreach ($plugins as $plugin) {
        }
 }
 
-elgg_delete_admin_notice('first_installation_plugin_reminder');
-
 // don't regenerate the simplecache because the plugin won't be
 // loaded until next run.  Just invalidate and let it regnerate as needed
 elgg_invalidate_simplecache();

diff --git a/actions/admin/plugins/set_priority.php b/actions/admin/plugins/set_priority.php
index 1203e22dee9f39615a83cbd543d37dbedf8f659b..fd7857e49175b55971477e44db6cd0d57cebf46b 100644 (file)
--- a/actions/admin/plugins/set_priority.php
+++ b/actions/admin/plugins/set_priority.php
@@ -30,8 +30,6 @@ if ($plugin->setPriority($priority)) {
        register_error(elgg_echo('admin:plugins:set_priority:no', array($plugin->manifest->getName())));
 }
 
-elgg_delete_admin_notice('first_installation_plugin_reminder');
-
 // don't regenerate the simplecache because the plugin won't be
 // loaded until next run.  Just invalidate and let it regnerate as needed
 elgg_invalidate_simplecache();

diff --git a/actions/admin/plugins/simple_update_states.php b/actions/admin/plugins/simple_update_states.php
index 216a458f48965c116d47b516cf92ff2cca80451f..662a5c3dd87c724e8c25c304418147be22d96f38 100644 (file)
--- a/actions/admin/plugins/simple_update_states.php
+++ b/actions/admin/plugins/simple_update_states.php
@@ -35,7 +35,6 @@ foreach ($installed_plugins as $plugin) {
 }
 
 if ($success) {
-       elgg_delete_admin_notice('first_installation_plugin_reminder');
        //system_message(elgg_echo('admin:plugins:simple_simple_success'));
 } else {
        register_error(elgg_echo('admin:plugins:simple_simple_fail'));

diff --git a/install/ElggInstaller.php b/install/ElggInstaller.php
index 2b8fd83240dfbd27d6ed9c556e9a28a9ebb57c60..aaa7860332850c629efbb7ffd48b9a827ed9a791 100644 (file)
--- a/install/ElggInstaller.php
+++ b/install/ElggInstaller.php
@@ -507,10 +507,6 @@ class ElggInstaller {
 
                $params = array();
                if ($this->autoLogin) {
-                       // remind users to enable / disable desired tools
-                       $msg = elgg_echo('firstadminlogininstructions');
-                       elgg_add_admin_notice('first_installation_plugin_reminder', $msg);
-
                        $params['destination'] = 'pg/admin/plugins/simple';
                } else {
                        $params['destination'] = 'index.php';

diff --git a/languages/en.php b/languages/en.php
index 8d9c1ca06e3d8afe016285c3de8fc1e6140f54e5..59eedb9e1166437a92f96caeb35a8f907e8f4084 100644 (file)
--- a/languages/en.php
+++ b/languages/en.php
@@ -459,8 +459,6 @@ $english = array(
        'registerbad' => "Your registration was unsuccessful because of an unknown error.",
        'registerdisabled' => "Registration has been disabled by the system administrator",
 
-       'firstadminlogininstructions' => "Enable and disable plugins to customize your new Elgg site! (Remember to hit 'Save' when you're done.)",
-
        'registration:notemail' => 'The email address you provided does not appear to be a valid email address.',
        'registration:userexists' => 'That username already exists',
        'registration:usernametooshort' => 'Your username must be a minimum of %u characters long.',