fixed an issue where when the user has no personal tags defined, he/she sees an empty...

diff --git a/blog/tags.html b/blog/tags.html
index c664b83577073b25b966f098a511eabf32a98c77..a4c60cc186a5c4f559c56ce02f57ba162bdfe149 100755 (executable)
--- 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 7d5593939425724abe3d36b1c5d114f44313e52b..1d909ea0f51ae8ca0476a082c8ad2e10fec45cd8 100755 (executable)
--- 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;
                 }