Changeset 4036

Show
Ignore:
Timestamp:
07/23/06 19:20:50 (2 years ago)
Author:
ryan
Message:

Trim theme and plugin data. fixes #2943

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/2.0/wp-admin/admin-functions.php

    r3980 r4036  
    14831483    preg_match("|Author URI:(.*)|i", $plugin_data, $author_uri); 
    14841484    if (preg_match("|Version:(.*)|i", $plugin_data, $version)) 
    1485         $version = $version[1]
     1485        $version = trim($version[1])
    14861486    else 
    14871487        $version = ''; 
    14881488 
    1489     $description = wptexturize($description[1]); 
     1489    $description = wptexturize(trim($description[1])); 
    14901490 
    14911491    $name = $plugin_name[1]; 
     
    14931493    $plugin = $name; 
    14941494    if ('' != $plugin_uri[1] && '' != $name) { 
    1495         $plugin = '<a href="'.$plugin_uri[1].'" title="'.__('Visit plugin homepage').'">'.$plugin.'</a>'; 
     1495        $plugin = '<a href="' . trim($plugin_uri[1]) . '" title="'.__('Visit plugin homepage').'">'.$plugin.'</a>'; 
    14961496    } 
    14971497 
    14981498    if ('' == $author_uri[1]) { 
    1499         $author = $author_name[1]
    1500     } else { 
    1501         $author = '<a href="'.$author_uri[1].'" title="'.__('Visit author homepage').'">'.$author_name[1].'</a>'; 
     1499        $author = trim($author_name[1])
     1500    } else { 
     1501        $author = '<a href="' . trim($author_uri[1]) . '" title="'.__('Visit author homepage').'">' . trim($author_name[1]) . '</a>'; 
    15021502    } 
    15031503 
  • branches/2.0/wp-includes/functions.php

    r4010 r4036  
    17421742    preg_match("|Template:(.*)|i", $theme_data, $template); 
    17431743    if ( preg_match("|Version:(.*)|i", $theme_data, $version) ) 
    1744         $version = $version[1]
     1744        $version = trim($version[1])
    17451745    else 
    17461746        $version =''; 
    17471747    if ( preg_match("|Status:(.*)|i", $theme_data, $status) ) 
    1748         $status = $status[1]
     1748        $status = trim($status[1])
    17491749    else 
    1750         $status ='publish'; 
    1751  
    1752     $description = wptexturize($description[1]); 
     1750        $status = 'publish'; 
     1751 
     1752    $description = wptexturize(trim($description[1])); 
    17531753 
    17541754    $name = $theme_name[1]; 
     
    17571757 
    17581758    if ( '' == $author_uri[1] ) { 
    1759         $author = $author_name[1]
    1760     } else { 
    1761         $author = '<a href="' . $author_uri[1] . '" title="' . __('Visit author homepage') . '">' . $author_name[1] . '</a>'; 
     1759        $author = trim($author_name[1])
     1760    } else { 
     1761        $author = '<a href="' . trim($author_uri[1]) . '" title="' . __('Visit author homepage') . '">' . trim($author_name[1]) . '</a>'; 
    17621762    } 
    17631763