Fossil SCM
Fix an accidental fork.
Commit
a5d6567ea6ad0cba34bfcfd6ec019a208a27f71e4759882f7e4be3f86426ce69
Parent
b70744576b31e65…
1 file changed
+6
-1
+6
-1
| --- src/forum.c | ||
| +++ src/forum.c | ||
| @@ -372,11 +372,16 @@ | ||
| 372 | 372 | db_static_prepare(&q, |
| 373 | 373 | "SELECT display_name(info) FROM user WHERE login=$login" |
| 374 | 374 | ); |
| 375 | 375 | db_bind_text(&q, "$login", zLogin); |
| 376 | 376 | if( db_step(&q)==SQLITE_ROW && db_column_type(&q,0)==SQLITE_TEXT ){ |
| 377 | - zResult = mprintf("%s (%s)", db_column_text(&q,0), zLogin); | |
| 377 | + const char *zDisplay = db_column_text(&q,0); | |
| 378 | + if( fossil_strcmp(zDisplay,zLogin)==0 ){ | |
| 379 | + zResult = fossil_strdup(zLogin); | |
| 380 | + }else{ | |
| 381 | + zResult = mprintf("%s (%s)", zDisplay, zLogin); | |
| 382 | + } | |
| 378 | 383 | }else{ |
| 379 | 384 | zResult = fossil_strdup(zLogin); |
| 380 | 385 | } |
| 381 | 386 | db_reset(&q); |
| 382 | 387 | return zResult; |
| 383 | 388 |
| --- src/forum.c | |
| +++ src/forum.c | |
| @@ -372,11 +372,16 @@ | |
| 372 | db_static_prepare(&q, |
| 373 | "SELECT display_name(info) FROM user WHERE login=$login" |
| 374 | ); |
| 375 | db_bind_text(&q, "$login", zLogin); |
| 376 | if( db_step(&q)==SQLITE_ROW && db_column_type(&q,0)==SQLITE_TEXT ){ |
| 377 | zResult = mprintf("%s (%s)", db_column_text(&q,0), zLogin); |
| 378 | }else{ |
| 379 | zResult = fossil_strdup(zLogin); |
| 380 | } |
| 381 | db_reset(&q); |
| 382 | return zResult; |
| 383 |
| --- src/forum.c | |
| +++ src/forum.c | |
| @@ -372,11 +372,16 @@ | |
| 372 | db_static_prepare(&q, |
| 373 | "SELECT display_name(info) FROM user WHERE login=$login" |
| 374 | ); |
| 375 | db_bind_text(&q, "$login", zLogin); |
| 376 | if( db_step(&q)==SQLITE_ROW && db_column_type(&q,0)==SQLITE_TEXT ){ |
| 377 | const char *zDisplay = db_column_text(&q,0); |
| 378 | if( fossil_strcmp(zDisplay,zLogin)==0 ){ |
| 379 | zResult = fossil_strdup(zLogin); |
| 380 | }else{ |
| 381 | zResult = mprintf("%s (%s)", zDisplay, zLogin); |
| 382 | } |
| 383 | }else{ |
| 384 | zResult = fossil_strdup(zLogin); |
| 385 | } |
| 386 | db_reset(&q); |
| 387 | return zResult; |
| 388 |