From: toyomoyo <toyomoyo>
Date: Fri, 21 Apr 2006 02:07:10 +0000 (+0000)
Subject: fixed an issue where when the user has no personal tags defined, he/she sees an empty... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=1d27654a195bcfe1826cc856a3ed9ed6a407e6a8;p=moodle.git

fixed an issue where when the user has no personal tags defined, he/she sees an empty line in tags page
---

diff --git a/blog/tags.html b/blog/tags.html
index c664b83577..a4c60cc186 100755
--- a/blog/tags.html
+++ b/blog/tags.html
@@ -42,8 +42,14 @@ print_heading(get_string('tagmanagement'));
             <select name="tags[]" multiple="multiple" size="8">
             <?php
                 $ptags1 = get_records_sql('SELECT * from '.$CFG->prefix.'tags WHERE type=\'personal\' AND userid = '.$USER->id.' ORDER by text ASC');
-                $ptags2 = get_records_sql('SELECT * from '.$CFG->prefix.'tags WHERE type=\'personal\' AND userid <> '.$USER->id.' ORDER by text ASC');;
-                $ptags = array_merge($ptags1, $ptags2);
+                $ptags2 = get_records_sql('SELECT * from '.$CFG->prefix.'tags WHERE type=\'personal\' AND userid <> '.$USER->id.' ORDER by text ASC');
+                
+                if (!empty($ptags1)) {
+                    $ptags = array_merge($ptags1, $ptags2);
+                } else {
+                    $ptags = $ptags2;
+                }
+
                 foreach ($ptags as $ptag) {
                     echo '<option value="'.$ptag->id.'">'.$ptag->text.'</option>';
                 }
diff --git a/blog/tags.php b/blog/tags.php
index 7d55939394..1d909ea0f5 100755
--- a/blog/tags.php
+++ b/blog/tags.php
@@ -71,7 +71,7 @@ switch ($mode) {
 
                 // you can only delete your own tags, or you have to be an admin
                 if (!isadmin() and $USER->id != $blogtag->userid) {
-                    notify('no right to delete');
+                    notify(get_string('norighttodeletetag','blog', $blogtag->text));
                     continue;
                 }