Merged MDL-14086: hide tabs when being forced to edit profile

diff --git a/lang/en_utf8/moodle.php b/lang/en_utf8/moodle.php
index 112990a701c7d8174a6e733061c154160a0f2762..c97387c9fdce53a0419b9cfd064c3c1943c18fbb 100644 (file)
--- a/lang/en_utf8/moodle.php
+++ b/lang/en_utf8/moodle.php
@@ -958,6 +958,7 @@ $string['moodledocslink'] = 'Moodle Docs for this page';
 $string['moodleversion'] = 'Moodle Version';
 $string['more'] = 'more';
 $string['moreinformation'] = 'More information about this error';
+$string['moreprofileinfoneeded'] = 'Please tell us more about yourself';
 $string['mostrecently'] = 'most recently';
 $string['move'] = 'Move';
 $string['movecategoryto'] = 'Move category to:';

diff --git a/user/tabs.php b/user/tabs.php
index 82f9263793bf12f098ac4465230087a1209090fc..a329943fd00b01ec2fe546eeae0e8dc62fcdce26 100644 (file)
--- a/user/tabs.php
+++ b/user/tabs.php
@@ -246,8 +246,12 @@
         $tabs = array($toprow);
     }
 
-/// Print out the tabs and continue!
-
-    print_tabs($tabs, $currenttab, $inactive, $activetwo);
+    if ($currenttab == 'editprofile' && ($user->id == $USER->id) && user_not_fully_set_up($USER)) {  
+        /// We're being forced here to fix profile
+      notify(get_string('moreprofileinfoneeded'));
+    } else {
+      /// Print out the tabs and continue!
+      print_tabs($tabs, $currenttab, $inactive, $activetwo);
+    }
 
 ?>