Changeset 847

Show
Ignore:
Timestamp:
06/07/07 07:15:47 (1 year ago)
Author:
mdawaffe
Message:

make numeric slugs non-numeric. Fixes #638

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/bb-admin/admin-functions.php

    r846 r847  
    427427        $forum_desc = $bbdb->escape( $forum_desc ); 
    428428 
    429         $forum_slug = bb_slug_sanitize($forum_name); 
    430         $existing_slugs = $bbdb->get_col("SELECT forum_slug FROM $bbdb->forums WHERE forum_slug LIKE '$forum_slug%'"); 
    431         if ($existing_slugs) { 
    432                 $forum_slug = bb_slug_increment($forum_slug, $existing_slugs); 
    433         } 
    434          
     429        $forum_slug = $_forum_slug = bb_slug_sanitize($forum_name); 
     430        while ( is_numeric($forum_slug) || $existing_slug = $bbdb->get_var("SELECT forum_slug FROM $bbdb->forums WHERE forum_slug = '$forum_slug'") ) 
     431                $forum_slug = bb_slug_increment($_forum_slug, $existing_slug); 
     432 
    435433        $bbdb->query("INSERT INTO $bbdb->forums (forum_name, forum_slug, forum_desc, forum_parent, forum_order) VALUES ('$forum_name', '$forum_slug', '$forum_desc', '$forum_parent', '$forum_order')"); 
    436434        $bb_cache->flush_one( 'forums' ); 

  • trunk/bb-includes/functions.php

    r846 r847  
    174174        $title = bb_trim_for_db( $title, 150 ); 
    175175        $slug  = $_slug = bb_slug_sanitize($title); 
    176         while ( $existing_slug = $bbdb->get_var("SELECT topic_slug FROM $bbdb->topics WHERE topic_slug = '$slug'") ) 
     176        while ( is_numeric($slug) || $existing_slug = $bbdb->get_var("SELECT topic_slug FROM $bbdb->topics WHERE topic_slug = '$slug'") ) 
    177177                $slug = bb_slug_increment($_slug, $existing_slug); 
    178178