vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-08-11 20:30:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Migration to get_settings and away from globals.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@957 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Matt Mullenweg
2004-03-01 19:55:45 +00:00
parent 59155a15f3
commit e64b754d4a
27 changed files with 51 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wp-includes/functions-formatting.php
+1 -2
View File
@@ -317,10 +317,9 @@ function convert_gmcode($content) { // depreciated
}
function convert_smilies($text) {
global $smilies_directory, $use_smilies;
global $wp_smiliessearch, $wp_smiliesreplace;
$output = '';
if ($use_smilies) {
if (get_settings('use_smilies')) {
// HTML loop taken from texturize function, could possible be consolidated
$textarr = preg_split("/(<.*>)/U", $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between
$stop = count($textarr);// loop stuff
wp-includes/functions.php
+3 -4
View File
@@ -932,7 +932,6 @@ function pingback($content, $post_ID) {
}
function doGeoUrlHeader($posts) {
global $use_default_geourl,$default_geourl_lat,$default_geourl_lon;
if (count($posts) == 1) {
// there's only one result see if it has a geo code
$row = $posts[0];
@@ -946,11 +945,11 @@ function doGeoUrlHeader($posts) {
return;
}
} else {
if($use_default_geourl) {
if(get_settings('use_default_geourl')) {
// send the default here
echo "<meta name=\"ICBM\" content=\"".$default_geourl_lat.", ".$default_geourl_lon."\" />\n";
echo "<meta name=\"ICBM\" content=\"". get_settings('default_geourl_lat') .", ". get_settings('default_geourl_lon') ."\" />\n";
echo "<meta name=\"DC.title\" content=\"".convert_chars(strip_tags(get_bloginfo("name")),"unicode")."\" />\n";
echo "<meta name=\"geo.position\" content=\"".$default_geourl_lat.";".$default_geourl_lon."\" />\n";
echo "<meta name=\"geo.position\" content=\"". get_settings('default_geourl_lat') .";". get_settings('default_geourl_lon') ."\" />\n";
}
}
}
wp-includes/template-functions-general.php
+1 -2
View File
@@ -22,7 +22,6 @@ function bloginfo_unicode($show='') {
}
function get_bloginfo($show='') {
global $admin_email;
$do_perma = 0;
$feed_url = get_settings('siteurl');
@@ -75,7 +74,7 @@ function get_bloginfo($show='') {
$output = get_settings('siteurl') .'/xmlrpc.php';
break;
case 'admin_email':
$output = $admin_email;
$output = get_settings('admin_email');
break;
case 'name':
default:
wp-includes/vars.php
+1 -1
View File
@@ -262,7 +262,7 @@ uksort($wpsmiliestrans, 'smiliescmp');
foreach($wpsmiliestrans as $smiley => $img) {
$wp_smiliessearch[] = $smiley;
$smiley_masked = str_replace(' ', '', $smiley);
$wp_smiliesreplace[] = " <img src='$smilies_directory/$img' alt='$smiley_masked' />";
$wp_smiliesreplace[] = " <img src='" . get_settings('smilies_directory') . "/$img' alt='$smiley_masked' />";
}