Changeset 956
- Timestamp:
- 03/01/04 06:13:32 (5 years ago)
- Files:
-
- trunk/index.php (modified) (1 diff)
- trunk/wp-admin/admin-header.php (modified) (1 diff)
- trunk/wp-admin/bookmarklet.php (modified) (1 diff)
- trunk/wp-admin/edit-form-advanced.php (modified) (2 diffs)
- trunk/wp-admin/edit-form-comment.php (modified) (1 diff)
- trunk/wp-admin/edit-form.php (modified) (3 diffs)
- trunk/wp-admin/install.php (modified) (2 diffs)
- trunk/wp-admin/link-import.php (modified) (1 diff)
- trunk/wp-admin/menu.php (modified) (1 diff)
- trunk/wp-admin/post.php (modified) (2 diffs)
- trunk/wp-admin/profile.php (modified) (4 diffs)
- trunk/wp-admin/upgrade-functions.php (modified) (1 diff)
- trunk/wp-admin/upload.php (modified) (8 diffs)
- trunk/wp-admin/users.php (modified) (1 diff)
- trunk/wp-atom.php (modified) (4 diffs)
- trunk/wp-comments-popup.php (modified) (2 diffs)
- trunk/wp-comments-post.php (modified) (2 diffs)
- trunk/wp-commentsrss2.php (modified) (4 diffs)
- trunk/wp-includes/functions-formatting.php (modified) (3 diffs)
- trunk/wp-includes/functions.php (modified) (13 diffs)
- trunk/wp-includes/template-functions-general.php (modified) (5 diffs)
- trunk/wp-locations.php (modified) (1 diff)
- trunk/wp-login.php (modified) (4 diffs)
- trunk/wp-rdf.php (modified) (4 diffs)
- trunk/wp-register.php (modified) (4 diffs)
- trunk/wp-rss.php (modified) (4 diffs)
- trunk/wp-rss2.php (modified) (3 diffs)
- trunk/wp-settings.php (modified) (1 diff)
- trunk/wp-trackback.php (modified) (2 diffs)
- trunk/wp.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/index.php
r950 r956 12 12 <title><?php bloginfo('name'); ?><?php wp_title(); ?></title> 13 13 14 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $blog_charset; ?>" />14 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" /> 15 15 <meta name="generator" content="WordPress <?php echo $wp_version; ?>" /> <!-- leave this for stats --> 16 16 trunk/wp-admin/admin-header.php
r879 r956 58 58 <link rel="stylesheet" href="wp-admin.css" type="text/css" /> 59 59 <link rel="shortcut icon" href="../wp-images/wp-favicon.png" /> 60 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $blog_charset?>" />60 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" /> 61 61 <?php 62 62 if ($redirect==1) { trunk/wp-admin/bookmarklet.php
r879 r956 72 72 <head> 73 73 <title>WordPress > Bookmarklet</title> 74 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $blog_charset?>" />74 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" /> 75 75 <link rel="stylesheet" href="wp-admin.css" type="text/css" /> 76 76 <link rel="shortcut icon" href="../wp-images/wp-favicon.png" /> trunk/wp-admin/edit-form-advanced.php
r955 r956 3 3 <?php 4 4 5 $allowed_users = explode(" ", trim( $fileupload_allowedusers));5 $allowed_users = explode(" ", trim(get_settings('fileupload_allowedusers'))); 6 6 7 7 $submitbutton_text = 'Save'; … … 12 12 $form_pingback = '<input type="hidden" name="post_pingback" value="0" />'; 13 13 $form_prevstatus = '<input type="hidden" name="prev_status" value="'.$post_status.'" />'; 14 if ( $use_trackback) {14 if (get_settings('use_trackback')) { 15 15 $form_trackback = '<p><label for="trackback"><a href="http://wordpress.org/docs/reference/post/#trackback" title="Help on trackbacks"><strong>TrackBack</strong> an <acronym title="Uniform Resource Locator">URL</acronym></a></label> 16 16 (Separate multiple <acronym title="Uniform Resource Locator">URL</acronym>s with spaces.)<br /> trunk/wp-admin/edit-form-comment.php
r955 r956 1 1 <?php 2 2 3 $allowed_users = explode(" ", trim( $fileupload_allowedusers));3 $allowed_users = explode(" ", trim(get_settings('fileupload_allowedusers'))); 4 4 5 5 $submitbutton_text = 'Edit this!'; trunk/wp-admin/edit-form.php
r955 r956 3 3 <?php 4 4 5 $allowed_users = explode(" ", trim( $fileupload_allowedusers));5 $allowed_users = explode(" ", trim(get_settings('fileupload_allowedusers'))); 6 6 7 7 $submitbutton_text = 'Blog this!'; … … 9 9 $form_action = 'post'; 10 10 $form_extra = ''; 11 if ( $use_pingback) {11 if (get_settings('use_pingback')) { 12 12 $form_pingback = '<input type="checkbox" class="checkbox" name="post_pingback" value="1" '; 13 13 if ($post_pingback) $form_pingback .= 'checked="checked" '; … … 16 16 $form_pingback = ''; 17 17 } 18 if ( $use_trackback) {18 if (get_settings('use_trackback')) { 19 19 $form_trackback = '<p><label for="trackback"><a href="http://wordpress.org/docs/reference/post/#trackback" title="Help on trackbacks"><strong>TrackBack</strong> an <acronym title="Uniform Resource Locator">URL</acronym></a>:</label> (Separate multiple <acronym title="Uniform Resource Locator">URL</acronym>s with spaces.)<br /> 20 20 <input type="text" name="trackback_url" style="width: 360px" id="trackback" tabindex="7" /></p>'; trunk/wp-admin/install.php
r947 r956 420 420 "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(26,'use_weblogsping', 2, '0', 'set this to true if you want your site to be listed on http://weblogs.com when you add a new post', 8, 20)", 421 421 "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(27,'use_blodotgsping', 2, '0', 'set this to true if you want your site to be listed on http://blo.gs when you add a new post', 8, 20)", 422 "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(28,'blodotgsping_url', 3, 'http://example.com', 'You shouldn\'t need to change this.', 8, 30)",423 422 "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(29,'use_trackback', 2, '1', 'set this to 0 or 1, whether you want to allow your posts to be trackback\'able or not note: setting it to zero would also disable sending trackbacks', 8, 20)", 424 423 "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES(30,'use_pingback', 2, '1', 'set this to 0 or 1, whether you want to allow your posts to be pingback\'able or not note: setting it to zero would also disable sending pingbacks', 8, 20)", … … 701 700 $query= "UPDATE $tableoptions set option_value='$url' where option_id=1"; //siteurl 702 701 $q = $wpdb->query($query); 703 $query= "UPDATE $tableoptions set option_value='$url' where option_id=28"; //blodotgsping_url704 $q = $wpdb->query($query);705 702 $query= "UPDATE $tableoptions set option_value='$url/wp-images/smilies' where option_id=17"; //smilies_directory 706 703 $q = $wpdb->query($query); trunk/wp-admin/link-import.php
r654 r956 100 100 else // try to get the upload file. 101 101 { 102 $uploaddir = $fileupload_realpath;102 $uploaddir = get_settings('fileupload_realpath'); 103 103 $uploadfile = $uploaddir.'/'.$_FILES['userfile']['name']; 104 104 trunk/wp-admin/menu.php
r945 r956 14 14 if ((substr($self, -20) == substr($item[1], -20) && empty($parent_file)) || ($parent_file && ($item[1] == $parent_file))) $class = ' class="current"'; 15 15 if ($user_level >= $item[0]) { 16 if (('upload.php' == $item[1] && $use_fileupload && ($user_level >= $fileupload_minlevel)17 && (in_array($user_login, explode(' ', $allowed_users)) || (trim( $fileupload_allowedusers)==""))) || 'upload.php' != $item[1])16 if (('upload.php' == $item[1] && get_settings('use_fileupload') && ($user_level >= get_settings('fileupload_minlevel')) 17 && (in_array($user_login, explode(' ', $allowed_users)) || (trim(get_settings('fileupload_allowedusers'))==''))) || 'upload.php' != $item[1]) 18 18 echo "\n\t<li><a href='{$item[1]}'$class>{$item[2]}</a></li>"; 19 19 } trunk/wp-admin/post.php
r949 r956 708 708 709 709 <?php 710 $bookmarklet_height= ( $use_trackback) ? 460 : 420;710 $bookmarklet_height= (get_settings('use_trackback')) ? 460 : 420; 711 711 712 712 if ($is_NS4 || $is_gecko) { 713 713 ?> 714 714 <a href="javascript:if(navigator.userAgent.indexOf('Safari') >= 0){Q=getSelection();}else{Q=document.selection?document.selection.createRange().text:document.getSelection();}void(window.open('<?php echo get_settings('siteurl') ?>/wp-admin/bookmarklet.php?text='+escape(Q)+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'WordPress bookmarklet','scrollbars=yes,width=600,height=460,left=100,top=150,status=yes'));">Press It 715 - <?php echo $blogname?></a>715 - <?php echo get_settings('blogname'); ?></a> 716 716 <?php 717 717 } else if ($is_winIE) { 718 718 ?> 719 719 <a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(btw=window.open('<?php echo get_settings('siteurl') ?>/wp-admin/bookmarklet.php?text='+escape(Q)+'<?php echo $bookmarklet_tbpb ?>&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'bookmarklet','scrollbars=yes,width=600,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();">Press it 720 - <?php echo $blogname?></a>720 - <?php echo get_settings('blogname'); ?></a> 721 721 <script type="text/javascript" language="JavaScript"> 722 722 <!-- … … 734 734 ?> 735 735 <a href="javascript:void(window.open('<?php echo get_settings('siteurl'); ?>/wp-admin/bookmarklet.php?popupurl='+escape(location.href)+'&popuptitle='+escape(document.title)+'<?php echo $bookmarklet_tbpb ?>','bookmarklet','scrollbars=yes,width=600,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));">Press it 736 - <?php echo $blogname?></a>736 - <?php echo get_settings('blogname'); ?></a> 737 737 <?php 738 738 } else if ($is_macIE) { 739 739 ?> 740 740 <a href="javascript:Q='';if(top.frames.length==0);void(btw=window.open('<?php echo get_settings('siteurl'); ?>/wp-admin/bookmarklet.php?text='+escape(document.getSelection())+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title)+'<?php echo $bookmarklet_tbpb ?>','bookmarklet','scrollbars=yes,width=600,height=<?php echo $bookmarklet_height ?>,left=100,top=150,status=yes'));btw.focus();">Press it 741 - <?php echo $blogname?></a>741 - <?php echo get_settings('blogname'); ?></a> 742 742 <?php 743 743 } trunk/wp-admin/profile.php
r945 r956 179 179 180 180 181 $bookmarklet_tbpb = ( $use_trackback) ? '&trackback=1' : '';182 $bookmarklet_tbpb .= ( $use_pingback) ? '&pingback=1' : '';183 $bookmarklet_height= ( $use_trackback) ? 590 : 550;181 $bookmarklet_tbpb = (get_settings('use_trackback')) ? '&trackback=1' : ''; 182 $bookmarklet_tbpb .= (get_settings('use_pingback')) ? '&pingback=1' : ''; 183 $bookmarklet_height= (get_settings('use_trackback')) ? 590 : 550; 184 184 185 185 ?> … … 192 192 <p>To have a one-click bookmarklet, just copy and paste this<br />into a new text file:</p> 193 193 <?php 194 $regedit = "REGEDIT4\r\n[HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\MenuExt\Post To &WP : ". $blogname."]\r\n@=\"javascript:doc=external.menuArguments.document;Q=doc.selection.createRange().text;void(btw=window.open('". get_settings('siteurl') ."/wp-admin/bookmarklet.php?text='+escape(Q)+'".$bookmarklet_tbpb."&popupurl='+escape(doc.location.href)+'&popuptitle='+escape(doc.title),'bookmarklet','scrollbars=no,width=480,height=".$bookmarklet_height.",left=100,top=150,status=yes'));btw.focus();\"\r\n\"contexts\"=hex:31\"";194 $regedit = "REGEDIT4\r\n[HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\MenuExt\Post To &WP : ". get_settings('blogname') ."]\r\n@=\"javascript:doc=external.menuArguments.document;Q=doc.selection.createRange().text;void(btw=window.open('". get_settings('siteurl') ."/wp-admin/bookmarklet.php?text='+escape(Q)+'".$bookmarklet_tbpb."&popupurl='+escape(doc.location.href)+'&popuptitle='+escape(doc.title),'bookmarklet','scrollbars=no,width=480,height=".$bookmarklet_height.",left=100,top=150,status=yes'));btw.focus();\"\r\n\"contexts\"=hex:31\""; 195 195 ?> 196 196 <pre style="margin: 20px; background-color: #cccccc; border: 1px dashed #333333; padding: 5px; font-size: 12px;"><?php echo $regedit; ?></pre> … … 217 217 $profiledata=get_userdata($user_ID); 218 218 219 $bookmarklet_tbpb = ( $use_trackback) ? '&trackback=1' : '';220 $bookmarklet_tbpb .= ( $use_pingback) ? '&pingback=1' : '';221 $bookmarklet_height= ( $use_trackback) ? 480 : 440;219 $bookmarklet_tbpb = (get_settings('use_trackback')) ? '&trackback=1' : ''; 220 $bookmarklet_tbpb .= (get_settings('use_pingback')) ? '&pingback=1' : ''; 221 $bookmarklet_height= (get_settings('use_trackback')) ? 480 : 440; 222 222 223 223 ?> … … 324 324 { 325 325 if ((typeof window.sidebar == "object") && (typeof window.sidebar.addPanel == "function")) 326 window.sidebar.addPanel("WordPress Post: <?php echo $blogname?>","<?php echo get_settings('siteurl'); ?>/wp-admin/sidebar.php","");326 window.sidebar.addPanel("WordPress Post: <?php echo get_settings('blogname'); ?>","<?php echo get_settings('siteurl'); ?>/wp-admin/sidebar.php",""); 327 327 else 328 328 alert('No Sidebar found! You must use Mozilla 0.9.4 or later!'); trunk/wp-admin/upgrade-functions.php
r955 r956 197 197 "26" => "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (26,'use_weblogsping', 2, '0', 'set this to true if you want your site to be listed on http://weblogs.com when you add a new post', 8, 20)", 198 198 "27" => "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (27,'use_blodotgsping', 2, '0', 'set this to true if you want your site to be listed on http://blo.gs when you add a new post', 8, 20)", 199 "28" => "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (28,'blodotgsping_url', 3, 'http://example.com', 'You shouldn\'t need to change this.', 8, 30)",200 199 "29" => "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (29,'use_trackback', 2, '1', 'set this to false or true, whether you want to allow your posts to be trackback\'able or not note: setting it to false would also disable sending trackbacks', 8, 20)", 201 200 "30" => "INSERT INTO $tableoptions (option_id, option_name, option_type, option_value, option_description, option_admin_level, option_width) VALUES (30,'use_pingback', 2, '1', 'set this to false or true, whether you want to allow your posts to be pingback\'able or not note: setting it to false would also disable sending pingbacks', 8, 20)", trunk/wp-admin/upload.php
r891 r956 7 7 die ("Cheatin' uh ?"); 8 8 9 if (! $use_fileupload) //Checks if file upload is enabled in the config9 if (!get_settings('use_fileupload')) //Checks if file upload is enabled in the config 10 10 die ("The admin disabled this function"); 11 11 12 $allowed_types = explode(' ', trim( $fileupload_allowedtypes));12 $allowed_types = explode(' ', trim(get_settings('fileupload_allowedtypes'))); 13 13 14 14 if ($HTTP_POST_VARS['submit']) { … … 18 18 } 19 19 20 if (!is_writable( $fileupload_realpath))20 if (!is_writable(get_settings('fileupload_realpath'))) 21 21 $action = 'not-writable'; 22 22 ?> … … 28 28 case 'not-writable': 29 29 ?> 30 <p>It doesn't look like you can use the file upload feature at this time because the directory you have specified (<code><?php echo $ fileupload_realpath; ?></code>) doesn't appear to be writable by WordPress. Check the permissions on the directory and for typos.</p>30 <p>It doesn't look like you can use the file upload feature at this time because the directory you have specified (<code><?php echo $get_settings('fileupload_realpath'); ?></code>) doesn't appear to be writable by WordPress. Check the permissions on the directory and for typos.</p> 31 31 32 32 <?php … … 43 43 <label for="img1">File:</label> 44 44 <br /> 45 <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $fileupload_maxk* 1024 ?>" />45 <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo get_settings('fileupload_maxk') * 1024 ?>" /> 46 46 <input type="file" name="img1" id="img1" size="35" class="uploadform" /></p> 47 47 <p> … … 97 97 98 98 if (strlen($imgalt)) { 99 $pathtofile = $fileupload_realpath."/".$imgalt;99 $pathtofile = get_settings('fileupload_realpath')."/".$imgalt; 100 100 $img1 = $HTTP_POST_VARS['img1']; 101 101 } else { 102 $pathtofile = $fileupload_realpath."/".$img1_name;102 $pathtofile = get_settings('fileupload_realpath')."/".$img1_name; 103 103 $img1 = $HTTP_POST_FILES['img1']['tmp_name']; 104 104 } … … 119 119 120 120 if (file_exists($pathtofile) && !strlen($imgalt)) { 121 $i = explode( " ",$fileupload_allowedtypes);122 $i = implode( ", ",array_slice($i, 1, count($i)-2));121 $i = explode(' ', get_settings('fileupload_allowedtypes')); 122 $i = implode(', ',array_slice($i, 1, count($i)-2)); 123 123 $moved = move_uploaded_file($img1, $pathtofile2); 124 124 // if move_uploaded_file() fails, try copy() … … 139 139 <p>Confirm or rename:</p> 140 140 <form action="upload.php" method="post" enctype="multipart/form-data"> 141 <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $fileupload_maxk*1024 ?>" />141 <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo get_settings('fileupload_maxk') *1024 ?>" /> 142 142 <input type="hidden" name="img1_type" value="<?php echo $img1_type;?>" /> 143 143 <input type="hidden" name="img1_name" value="<?php echo $img2_name;?>" /> … … 198 198 199 199 if ( ereg('image/',$img1_type)) { 200 $piece_of_code = "<img src=" $fileupload_url/$img1_name" alt="$imgdesc" />";200 $piece_of_code = "<img src="". get_settings('fileupload_url') ."/$img1_name" alt="$imgdesc" />"; 201 201 } else { 202 $piece_of_code = "<a href=" $fileupload_url/$img1_name" title="$imgdesc" />$imgdesc</a>";202 $piece_of_code = "<a href="". get_settings('fileupload_url') . "/$img1_name" title="$imgdesc" />$imgdesc</a>"; 203 203 }; 204 204 trunk/wp-admin/users.php
r955 r956 87 87 } 88 88 89 $message = "New user registration on your blog $blogname:\r\n\r\n";89 $message = 'New user registration on your blog ' . get_settings('blogname') . ":\r\n\r\n"; 90 90 $message .= "Login: $user_login\r\n\r\nE-mail: $user_email"; 91 91 92 @mail($admin_email, "[$blogname] New User Registration", $message);92 @mail($admin_email, '[' . get_settings('blogname') . '] New User Registration', $message); 93 93 header('Location: users.php'); 94 94 break; trunk/wp-atom.php
r901 r956 8 8 header('Content-type: application/atom+xml', true); 9 9 10 if (!isset($rss_language)) { $rss_language = 'en'; }11 if (!isset($rss_encoded_html)) { $rss_encoded_html = 0; }12 if (!isset($rss_excerpt_length) || ($rss_encoded_html == 1)) { $rss_excerpt_length = 0; }13 10 ?> 14 11 <?php echo '<?xml version="1.0"?'.'>'; ?> … … 16 13 xmlns="http://purl.org/atom/ns#" 17 14 xmlns:dc="http://purl.org/dc/elements/1.1/" 18 xml:lang="<?php echo $rss_language?>">15 xml:lang="<?php echo get_settings('rss_language'); ?>"> 19 16 <title><?php bloginfo_rss('name') ?></title> 20 17 <link rel="alternate" type="text/html" href="<?php bloginfo_rss('url') ?>" /> … … 35 32 <issued><?php the_time('Y-m-d\TH:i:s\Z'); ?></issued> 36 33 <?php the_category_rss('rdf') ?> 37 <?php $more = 1; if ( $rss_use_excerpt) {34 <?php $more = 1; if (get_settings('rss_use_excerpt')) { 38 35 ?> 39 <summary type="text/html" mode="escaped"><?php the_excerpt_rss( $rss_excerpt_length, 2) ?></summary>36 <summary type="text/html" mode="escaped"><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></summary> 40 37 <?php 41 38 } else { // use content 42 39 ?> 43 <summary type="text/html"><?php the_content_rss('', 0, '', $rss_excerpt_length, 2) ?></summary>40 <summary type="text/html"><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length'), 2) ?></summary> 44 41 <?php 45 42 } // end else use content … … 47 44 <content type="text/html" mode="escaped" xml:base="<?php permalink_single_rss() ?>"><![CDATA[<?php the_content('', 0, '') ?>]]></content> 48 45 </entry> 49 <?php $items_count++; if (($items_count == $posts_per_rss) && empty($m)) { break; } } } ?>46 <?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?> 50 47 </feed> trunk/wp-comments-popup.php
r945 r956 9 9 <html xmlns="http://www.w3.org/1999/xhtml"> 10 10 <head> 11 <title><?php echo $blogname?> - Comments on "<?php the_title() ?>"</title>11 <title><?php echo get_settings('blogname'); ?> - Comments on "<?php the_title() ?>"</title> 12 12 13 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $blog_charset; ?>" />13 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" /> 14 14 <style type="text/css" media="screen"> 15 15 @import url( wp-layout.css ); … … 20 20 <body id="commentspopup"> 21 21 22 <h1 id="header"><a href="" title="<?php echo $blogname ?>"><?php echo $blogname?></a></h1>22 <h1 id="header"><a href="" title="<?php echo get_settings('blogname'); ?>"><?php echo get_settings('blogname'); ?></a></h1> 23 23 24 24 <h2 id="comments">Comments</h2> trunk/wp-comments-post.php
r914 r956 40 40 die('Sorry, comments are closed for this item.'); 41 41 42 if ( $require_name_email&& ($email == '' || $author == '')) { //original fix by Dodo, and then Drinyth42 if (get_settings('require_name_email') && ($email == '' || $author == '')) { //original fix by Dodo, and then Drinyth 43 43 die('Error: please fill the required fields (name, email).'); 44 44 } … … 102 102 } 103 103 104 if (( $comments_notify) && ($approved)) {104 if ((get_settings('comments_notify')) && ($approved)) { 105 105 wp_notify_postauthor($comment_ID, 'comment'); 106 106 } trunk/wp-commentsrss2.php
r900 r956 6 6 header('Content-type: text/xml'); 7 7 8 if (!isset($rss_language)) { $rss_language = 'en'; }9 8 echo '<?xml version="1.0"?'.'>'; 10 9 ?> … … 22 21 <link><?php (isset($_REQUEST["p"]) || isset($_REQUEST["name"])) ? permalink_single_rss() : bloginfo_rss("url") ?></link> 23 22 <description><?php bloginfo_rss("description") ?></description> 24 <language><?php echo $rss_language?></language>23 <language><?php echo get_settings('rss_language'); ?></language> 25 24 <pubDate><?php echo gmdate('r'); ?></pubDate> 26 25 <generator>http://wordpress.org/?v=<?php echo $wp_version ?></generator> … … 34 33 AND $tablecomments.comment_approved = '1' AND $tableposts.post_status = 'publish' 35 34 AND post_date < '".date("Y-m-d H:i:s")."' 36 ORDER BY comment_date LIMIT $posts_per_rss");35 ORDER BY comment_date LIMIT " . get_settings('posts_per_rss') ); 37 36 } else { // if no post id passed in, we'll just ue the last 10 comments. 38 37 $comments = $wpdb->get_results("SELECT comment_ID, comment_author, comment_author_email, … … 41 40 LEFT JOIN $tableposts ON comment_post_id = id WHERE $tableposts.post_status = 'publish' 42 41 AND $tablecomments.comment_approved = '1' AND post_date < '".date("Y-m-d H:i:s")."' 43 ORDER BY comment_date DESC LIMIT $posts_per_rss");42 ORDER BY comment_date DESC LIMIT " . get_settings('posts_per_rss') ); 44 43 } 45 44 // this line is WordPress' motor, do not delete it. trunk/wp-includes/functions-formatting.php
r955 r956 82 82 83 83 function convert_chars($content, $flag='obsolete attribute left there for backwards compatibility') { // html/unicode entities output 84 global $ use_htmltrans, $wp_htmltrans, $wp_htmltranswinuni;84 global $wp_htmltrans, $wp_htmltranswinuni; 85 85 86 86 // removes metadata tags … … 88 88 $content = preg_replace('/<category>(.+?)<\/category>/','',$content); 89 89 90 if ( $use_htmltrans) {90 if (get_settings('use_htmltrans')) { 91 91 // converts lone & characters into & (a.k.a. &) 92 92 $content = preg_replace('/&[^#](?![a-z]*;)/ie', '"&".substr("\0",1)', $content); … … 125 125 */ 126 126 function balanceTags($text, $is_comment = 0) { 127 global $use_balanceTags;128 127 129 if ( $use_balanceTags== 0) {128 if (get_settings('use_balanceTags') == 0) { 130 129 return $text; 131 130 } trunk/wp-includes/functions.php
r952 r956 86 86 $weekday = date('w',$day); 87 87 $i = 86400; 88 while ($weekday > $start_of_week) {88 while ($weekday > get_settings('start_of_week')) { 89 89 $weekday = date('w',$day); 90 90 $day = $day - 86400; … … 566 566 function pingWeblogs($blog_ID = 1) { 567 567 // original function by Dries Buytaert for Drupal 568 global $use_weblogsping, $blogname; 569 if ((!(($blogname=="my weblog") && (get_settings('siteurl')=="http://example.com") && (get_settings('blogfilename') == "wp.php"))) && (!preg_match("/localhost\//", get_settings('siteurl'))) && ($use_weblogsping)) { 568 if ((!((get_settings('blogname')=="my weblog") && (get_settings('siteurl')=="http://example.com") && (get_settings('blogfilename') == "wp.php"))) && (!preg_match("/localhost\//", get_settings('siteurl'))) && (get_settings('use_weblogsping'))) { 570 569 $client = new xmlrpc_client("/RPC2", "rpc.weblogs.com", 80); 571 $message = new xmlrpcmsg("weblogUpdates.ping", array(new xmlrpcval( $blogname),570 $message = new xmlrpcmsg("weblogUpdates.ping", array(new xmlrpcval(get_settings('blogname')), 572 571 new xmlrpcval(get_settings('siteurl') . '/' . get_settings('blogfilename') 573 572 ))); … … 584 583 // pings Weblogs.com/rssUpdates 585 584 function pingWeblogsRss($blog_ID = 1, $rss_url) { 586 global $use_weblogsrssping, $ blogname, $rss_url;587 if ( $blogname!= 'my weblog' && $rss_url != 'http://example.com/b2rdf.php' && $use_weblogsrssping) {585 global $use_weblogsrssping, $rss_url; 586 if (get_settings('blogname') != 'my weblog' && $rss_url != 'http://example.com/b2rdf.php' && $use_weblogsrssping) { 588 587 $client = new xmlrpc_client('/RPC2', 'rssrpc.weblogs.com', 80); 589 $message = new xmlrpcmsg('rssUpdate', array(new xmlrpcval( $blogname), new xmlrpcval($rss_url)));588 $message = new xmlrpcmsg('rssUpdate', array(new xmlrpcval(get_settings('blogname')), new xmlrpcval($rss_url))); 590 589 $result = $client->send($message); 591 590 if (!$result || $result->faultCode()) { … … 600 599 // pings Caf�g.com 601 600 function pingCafelog($cafelogID,$title='',$p='') { 602 global $use_cafelogping , $blogname;603 if ((!(( $blogname=="my weblog") && (get_settings('siteurl') == "http://example.com") && (get_settings('blogfilename')=="wp.php"))) && (!preg_match("/localhost\//", get_settings('siteurl'))) && ($use_cafelogping) && ($cafelogID != '')) {601 global $use_cafelogping; 602 if ((!((get_settings('blogname')=="my weblog") && (get_settings('siteurl') == "http://example.com") && (get_settings('blogfilename')=="wp.php"))) && (!preg_match("/localhost\//", get_settings('siteurl'))) && ($use_cafelogping) && ($cafelogID != '')) { 604 603 $client = new xmlrpc_client("/xmlrpc.php", "cafelog.tidakada.com", 80); 605 604 $message = new xmlrpcmsg("b2.ping", array(new xmlrpcval($cafelogID), new xmlrpcval($title), new xmlrpcval($p))); … … 616 615 // pings Blo.gs 617 616 function pingBlogs($blog_ID="1") { 618 global $use_ blodotgsping, $blodotgsping_url, $use_rss, $blogname;619 if ((!(( $blogname=='my weblog') && (get_settings('siteurl')=='http://example.com') && (get_settings('blogfilename')=='wp.php'))) && (!preg_match('/localhost\//',get_settings('siteurl'))) && ($use_blodotgsping)) {620 $url = ($blodotgsping_url == 'http://example.com') ? get_settings('siteurl').'/'.get_settings('blogfilename') : $blodotgsping_url;617 global $use_rss; 618 if ((!((get_settings('blogname')=='my weblog') && (get_settings('siteurl')=='http://example.com') && (get_settings('blogfilename')=='wp.php'))) && (!preg_match('/localhost\//',get_settings('siteurl'))) && (get_settings('use_blodotgsping'))) { 619 $url = get_settings('siteurl').'/'.get_settings('blogfilename'); 621 620 $client = new xmlrpc_client('/', 'ping.blo.gs', 80); 622 621 if ($use_rss) { 623 $message = new xmlrpcmsg('weblogUpdates.extendedPing', array(new xmlrpcval( $blogname), new xmlrpcval($url), new xmlrpcval($url), new xmlrpcval(get_settings('siteurl').'/b2rss.xml')));622 $message = new xmlrpcmsg('weblogUpdates.extendedPing', array(new xmlrpcval(get_settings('blogname')), new xmlrpcval($url), new xmlrpcval($url), new xmlrpcval(get_settings('siteurl').'/b2rss.xml'))); 624 623 } else { 625 $message = new xmlrpcmsg('weblogUpdates.ping', array(new xmlrpcval( $blogname), new xmlrpcval($url)));624 $message = new xmlrpcmsg('weblogUpdates.ping', array(new xmlrpcval(get_settings('blogname')), new xmlrpcval($url))); 626 625 } 627 626 $result = $client->send($message); … … 638 637 // Send a Trackback 639 638 function trackback($trackback_url, $title, $excerpt, $ID) { 640 global $ blogname, $wpdb, $tableposts;639 global $wpdb, $tableposts; 641 640 $title = urlencode(stripslashes($title)); 642 641 $excerpt = urlencode(stripslashes($excerpt)); 643 $blog_name = urlencode(stripslashes( $blogname));642 $blog_name = urlencode(stripslashes(get_settings('blogname'))); 644 643 $tb_url = $trackback_url; 645 644 $url = urlencode(get_permalink($ID)); … … 972 971 973 972 function pingGeoURL($blog_ID) { 974 global $blodotgsping_url; 975 976 $ourUrl = $blodotgsping_url."/index.php?p=".$blog_ID; 973 974 $ourUrl = get_settings('siteurl') ."/index.php?p=".$blog_ID; 977 975 $host="geourl.org"; 978 976 $path="/ping/?p=".$ourUrl; … … 1045 1043 global $wpdb, $tablecomments, $tableposts, $tableusers; 1046 1044 global $querystring_start, $querystring_equal, $querystring_separator; 1047 global $blogname, $blog_charset;1048 1045 1049 1046 $comment = $wpdb->get_row("SELECT * FROM $tablecomments WHERE comment_ID='$comment_id' LIMIT 1"); … … 1055 1052 $comment_author_domain = gethostbyaddr($comment->comment_author_IP); 1056 1053 1057 $blogname = stripslashes( $blogname);1054 $blogname = stripslashes(get_settings('blogname')); 1058 1055 1059 1056 if ('comment' == $comment_type) { … … 1091 1088 $message_headers = "MIME-Version: 1.0\r\n" 1092 1089 . "$from\r\n" 1093 . "Content-Type: text/plain; charset=\" $blog_charset\"\r\n";1090 . "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\r\n"; 1094 1091 1095 1092 @mail($user->user_email, $subject, $notify_message, $message_headers); … … 1106 1103 global $wpdb, $tablecomments, $tableposts, $tableusers; 1107 1104 global $querystring_start, $querystring_equal, $querystring_separator; 1108 global $blogname, $blog_charset;1109 1105 1110 1106 $comment = $wpdb->get_row("SELECT * FROM $tablecomments WHERE comment_ID='$comment_id' LIMIT 1"); … … 1126 1122 $notify_message .= get_settings('siteurl') . "/wp-admin/moderation.php\r\n"; 1127 1123 1128 $subject = '[' . stripslashes( $blogname) . '] Please approve: "' .stripslashes($post->post_title).'"';1124 $subject = '[' . stripslashes(get_settings('blogname')) . '] Please approve: "' .stripslashes($post->post_title).'"'; 1129 1125 $admin_email = get_settings("admin_email"); 1130 1126 $from = "From: $admin_email"; … … 1132 1128 $message_headers = "MIME-Version: 1.0\r\n" 1133 1129 . "$from\r\n" 1134 . "Content-Type: text/plain; charset=\" $blog_charset\"\r\n";1130 . "Content-Type: text/plain; charset=\"" . get_settings('blog_charset') . "\"\r\n"; 1135 1131 1136 1132 @mail($admin_email, $subject, $notify_message, $message_headers); trunk/wp-includes/template-functions-general.php
r955 r956 23 23 24 24 function get_bloginfo($show='') { 25 global $ blogname, $admin_email;25 global $admin_email; 26 26 27 27 $do_perma = 0; … … 80 80 case 'name': 81 81 default: 82 $output = $blogname;82 $output = get_settings('blogname'); 83 83 break; 84 84 } … … 206 206 function get_archives($type='', $limit='', $format='html', $before = "", $after = "", $show_post_count = false) { 207 207 global $tableposts, $time_difference; 208 global $querystring_start, $querystring_equal, $querystring_separator, $month, $wpdb , $start_of_week;208 global $querystring_start, $querystring_equal, $querystring_separator, $month, $wpdb; 209 209 210 210 if ('' == $type) { … … 271 271 } 272 272 } elseif ('weekly' == $type) { 273 if (!isset($start_of_week)) { 274 $start_of_week = 1; 275 } 273 $start_of_week = get_settings('start_of_week'); 276 274 $arcresults = $wpdb->get_results("SELECT DISTINCT WEEK($wp_posts_post_date_field, $start_of_week) AS `week`, YEAR($wp_posts_post_date_field) AS yr, DATE_FORMAT($wp_posts_post_date_field, '%Y-%m-%d') AS yyyymmdd FROM $tableposts WHERE post_date < '$now' AND post_status = 'publish' ORDER BY post_date DESC" . $limit); 277 275 $arc_w_last = ''; … … 281 279 $arc_year = $arcresult->yr; 282 280 $arc_w_last = $arcresult->week; 283 $arc_week = get_weekstartend($arcresult->yyyymmdd, $start_of_week);281 $arc_week = get_weekstartend($arcresult->yyyymmdd, get_settings('start_of_week')); 284 282 $arc_week_start = date_i18n($archive_week_start_date_format, $arc_week['start']); 285 283 $arc_week_end = date_i18n($archive_week_end_date_format, $arc_week['end']); trunk/wp-locations.php
r628 r956 16 16 <longitude><?php print_Lon() ?></longitude> 17 17 <?php 18 if ( $rss_use_excerpt) {18 if (get_settings('rss_use_excerpt')) { 19 19 ?> 20 <note><?php the_content_rss('', 0, '', $rss_excerpt_length, $rss_encoded_html) ?>20 <note><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length'), get_settings('rss_encoded_html')) ?> 21 21 </note> 22 22 <?php 23 23 } else { // use content 24 24 ?> 25 <note><?php the_excerpt_rss('', 0, '', $rss_excerpt_length, $rss_encoded_html) ?></note>25 <note><?php the_excerpt_rss('', 0, '', get_settings('rss_excerpt_length'), get_settings('rss_encoded_html')) ?></note> 26 26 <?php 27 27 } // end else use content trunk/wp-login.php
r955 r956 163 163 <head> 164 164 <title>WordPress › Lost password ?</title> 165 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $blog_charset; ?>" />165 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" /> 166 166 <link rel="stylesheet" href="<?php echo get_settings('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" /> 167 167 <script type="text/javascript"> … … 214 214 $message .= 'Login at: ' . get_settings('siteurl') . '/wp-login.php'; 215 215 216 $m = mail($user_email, "[$blogname] Your weblog's login/password", $message);216 $m = mail($user_email, '[' . get_settings('blogname') . "] Your weblog's login/password", $message); 217 217 218 218 if ($m == false) { … … 224 224 <a href='wp-login.php' title='Check your email first, of course'>Click here to login!</a></p>"; 225 225 // send a copy of password change notification to the admin 226 mail($admin_email, "[$blogname] Password Lost/Change", "Password Lost and Changed for user: $user_login");226 mail($admin_email, '[' . get_settings('blogname') . "] Password Lost/Change", "Password Lost and Changed for user: $user_login"); 227 227 die(); 228 228 } … … 267 267 <head> 268 268 <title>WordPress > <?php bloginfo('name') ?> > Login form</title> 269 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $blog_charset; ?>" />269 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" /> 270 270 <link rel="stylesheet" href="<?php echo get_settings('siteurl'); ?>/wp-admin/wp-admin.css" type="text/css" /> 271 271 <script type="text/javascript"> trunk/wp-rdf.php
r901 r956 23 23 24 24 add_filter('the_content', 'trim'); 25 if (!isset($rss_language)) { $rss_language = 'en'; }26 25 ?> 27 26 <?php echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?".">"; ?> … … 39 38 <link><?php bloginfo_rss('url') ?></link> 40 39 <description><?php bloginfo_rss('description') ?></description> 41 <dc:language><?php echo $rss_language?></dc:language>40 <dc:language><?php echo get_settings('rss_language'); ?></dc:language> 42 41 <dc:date><?php echo gmdate('Y-m-d\TH:i:s'); ?></dc:date> 43 42 <dc:creator><?php echo antispambot($admin_email) ?></dc:creator> … … 51 50 <?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?> 52 51 <rdf:li rdf:resource="<?php permalink_single_rss() ?>"/> 53 <?php $wp_items[] = $row; $items_count++; if (($items_count == $posts_per_rss) && empty($m)) { break; } } } ?>52 <?php $wp_items[] = $row; $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?> 54 53 </rdf:Seq> 55 54 </items> … … 62 61 <dc:creator><?php the_author() ?> (mailto:<?php the_author_email() ?>)</dc:creator> 63 62 <?php the_category_rss('rdf') ?> 64 <?php $more = 1; if ( $rss_use_excerpt) {63 <?php $more = 1; if (get_settings('rss_use_excerpt')) { 65 64 ?> 66 <description><?php the_excerpt_rss( $rss_excerpt_length, 2) ?></description>65 <description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), 2) ?></description> 67 66 <?php 68 67 } else { // use content 69 68 ?> 70 <description><?php the_content_rss('', 0, '', $rss_excerpt_length, 2) ?></description>69 <description><?php the_content_rss('', 0, '', get_settings('rss_excerpt_length'), 2) ?></description> 71 70 <?php 72 71 } // end else use content trunk/wp-register.php
r955 r956 105 105 } 106 106 107 $message = "New user registration on your blog $blogname:\r\n\r\n";107 $message = 'New user registration on your blog ' . get_settings('blogname') . ":\r\n\r\n"; 108 108 $message .= "Login: $user_login\r\n\r\nE-mail: $user_email"; 109 109 110 @mail($admin_email, "[$blogname] New User Registration", $message);110 @mail($admin_email, '[' . get_settings('blogname') . '] New User Registration', $message); 111 111 112 112 ?> … … 115 115 <head> 116 116 <title>WordPress » Registration Complete</title> 117 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $blog_charset; ?>" />117 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" /> 118 118 <link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" /> 119 119 </head> … … 143 143 <head> 144 144 <title>WordPress » Registration Currently Disabled</title> 145 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $blog_charset; ?>">145 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>"> 146 146 <link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css"> 147 147 </head> … … 169 169 <head> 170 170 <title>WordPress » Registration Form</title> 171 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo $blog_charset; ?>" />171 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo get_settings('blog_charset'); ?>" /> 172 172 <link rel="stylesheet" href="wp-admin/wp-admin.css" type="text/css" /> 173 173 </head> trunk/wp-rss.php
r836 r956 23 23 */ 24 24 25 if (!isset($rss_language)) { $rss_language = 'en'; }26 if (!isset($rss_encoded_html)) { $rss_encoded_html = 0; }27 if (!isset($rss_excerpt_length) || ($rss_encoded_html == 1)) { $rss_excerpt_length = 0; }28 25 ?> 29 26 <?php echo "<?xml version=\"1.0\"?".">"; ?> … … 38 35 <managingEditor><?php echo antispambot($admin_email) ?></managingEditor> 39 36 <webMaster><?php echo antispambot($admin_email) ?></webMaster> 40 <language><?php echo $rss_language?></language>37 <language><?php echo get_settings('rss_language'); ?></language> 41 38 42 39 <?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?> … … 48 45 // echo "<category>"; the_category_unicode(); echo "</category>"; 49 46 $more = 1; 50 if ( $rss_use_excerpt) {47 if (get_settings('rss_use_excerpt')) { 51 48 ?> 52 <description><?php the_excerpt_rss( $rss_excerpt_length, $rss_encoded_html) ?></description>49 <description><?php the_excerpt_rss(get_settings('rss_excerpt_length'), get_settings('rss_encoded_html')) ?></description>