trying to fix bug 5266

diff --git a/blog/tags.html b/blog/tags.html
index a4c60cc186a5c4f559c56ce02f57ba162bdfe149..99d1b9eb51806605e4150eda6f90c5880419f0b8 100755 (executable)
--- a/blog/tags.html
+++ b/blog/tags.html
@@ -44,14 +44,22 @@ print_heading(get_string('tagmanagement'));
                 $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');
                 
-                if (!empty($ptags1)) {
-                    $ptags = array_merge($ptags1, $ptags2);
-                } else {
+                $ptags = array();
+                
+                if (!empty($ptags1)) { // user's own tag exists
+                    if (!empty($ptags2)) { // user's own tags, and other users tags exist, we merge
+                        $ptags = array_merge($ptags1, $ptags2);
+                    } else { // user's own tags exist, no other personal tags, just use that
+                        $ptags = $ptags1;
+                    }
+                } else if (!empty($ptags2)) {
                     $ptags = $ptags2;
-                }
+                } 
 
-                foreach ($ptags as $ptag) {
-                    echo '<option value="'.$ptag->id.'">'.$ptag->text.'</option>';
+                if (!empty($ptags)) {
+                    foreach ($ptags as $ptag) {
+                        echo '<option value="'.$ptag->id.'">'.$ptag->text.'</option>';
+                    }
                 }
             ?>
             </select>