[wp-cvs] wordpress/wp-admin link-manager.php, 1.23.4.1,
1.23.4.2 options-reading.php, 1.8.4.1, 1.8.4.2 post.php,
1.59.4.1, 1.59.4.2 profile.php, 1.19.4.1, 1.19.4.2 upload.php,
1.14.4.1, 1.14.4.2
Mike Little
mikelittle at users.sourceforge.net
Tue Oct 5 22:39:09 UTC 2004
- Previous message: [wp-cvs] wordpress/wp-content link-update-cache.xml, 1.1.4.1,
1.1.4.2
- Next message: [wp-cvs] wordpress/wp-includes functions-formatting.php, 1.30.4.1,
1.30.4.2 functions.php, 1.101.4.2, 1.101.4.3 links.php,
1.12.4.1, 1.12.4.2 version.php, 1.15.4.1, 1.15.4.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/cafelog/wordpress/wp-admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1012/wp-admin
Modified Files:
Tag: WordPress-Ver-1_2-Branch
link-manager.php options-reading.php post.php profile.php
upload.php
Log Message:
Reverted dubious commits on 1.2 branch
Index: options-reading.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/options-reading.php,v
retrieving revision 1.8.4.1
retrieving revision 1.8.4.2
diff -C2 -d -r1.8.4.1 -r1.8.4.2
*** options-reading.php 28 May 2004 03:50:18 -0000 1.8.4.1
--- options-reading.php 5 Oct 2004 22:39:06 -0000 1.8.4.2
***************
*** 55,61 ****
<td><input name="posts_per_page" type="text" id="posts_per_page" value="<?php echo get_settings('posts_per_page'); ?>" size="3" />
<select name="what_to_show" id="what_to_show" >
! <option value="days" <?php selected('days', get_settings('what_to_show')); ?>><?php _e('days') ?></option>
! <option value="posts" <?php selected('posts', get_settings('what_to_show')); ?>><?php _e('posts') ?></option>
! <option value="paged" <?php selected('paged', get_settings('what_to_show')); ?>><?php _e('posts paged') ?></option>
</select> </td>
</tr>
--- 55,61 ----
<td><input name="posts_per_page" type="text" id="posts_per_page" value="<?php echo get_settings('posts_per_page'); ?>" size="3" />
<select name="what_to_show" id="what_to_show" >
! <option value="days" <?php selected('days', get_settings('what_to_show')); ?>>days</option>
! <option value="posts" <?php selected('posts', get_settings('what_to_show')); ?>>posts</option>
! <option value="paged" <?php selected('paged', get_settings('what_to_show')); ?>>posts paged</option>
</select> </td>
</tr>
Index: link-manager.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/link-manager.php,v
retrieving revision 1.23.4.1
retrieving revision 1.23.4.2
diff -C2 -d -r1.23.4.1 -r1.23.4.2
*** link-manager.php 28 May 2004 03:50:18 -0000 1.23.4.1
--- link-manager.php 5 Oct 2004 22:39:06 -0000 1.23.4.2
***************
*** 608,615 ****
<tr>
<td>
! <?php printf(__('<strong>Show</strong> links in category: %s'), gethelp_link($this_file,'link_categories'));?><br />
</td>
<td>
! <?php printf(__('<strong>Order</strong> by: %s'), gethelp_link($this_file,'order_by'));?>
</td>
<td> </td>
--- 608,615 ----
<tr>
<td>
! <strong>Show</strong> links in category:<?php echo gethelp_link($this_file,'link_categories');?><br />
</td>
<td>
! <strong>Order</strong> by:<?php echo gethelp_link($this_file,'order_by');?>
</td>
<td> </td>
***************
*** 623,627 ****
if ($cat_id == 'All')
echo " selected='selected'";
! echo "> " . __('All') . "</option>\n";
foreach ($results as $row) {
echo " <option value=\"".$row->cat_id."\"";
--- 623,627 ----
if ($cat_id == 'All')
echo " selected='selected'";
! echo "> All</option>\n";
foreach ($results as $row) {
echo " <option value=\"".$row->cat_id."\"";
***************
*** 707,717 ****
$style = ($i % 2) ? ' class="alternate"' : '';
echo <<<LINKS
!
<tr valign="middle" $style>
<td><strong>$link->link_name</strong><br />
! LINKS;
! echo sprintf(__('Description: %s'), $link->link_description) . "</td>";
! echo "<td><a href=\"$link->link_url\" title=\"" . sprintf(__('Visit %s'), $link->link_name) . "\">$short_url</a></td>";
! echo <<<LINKS
<td>$link->category</td>
<td>$link->link_rel</td>
--- 707,716 ----
$style = ($i % 2) ? ' class="alternate"' : '';
echo <<<LINKS
!
!
<tr valign="middle" $style>
<td><strong>$link->link_name</strong><br />
! Description: $link->link_description</td>
! <td><a href="$link->link_url" title="Visit $link->link_name">$short_url</a></td>
<td>$link->category</td>
<td>$link->link_rel</td>
***************
*** 726,732 ****
if ($show_buttons) {
! echo '<td><a href="link-manager.php?link_id=' . $link->link_id . '&action=linkedit" class="edit">' . __('Edit') . '</a></td>';
! echo '<td><a href="link-manager.php?link_id=' . $link->link_id . '&action=Delete"' . "onclick=\"return confirm('" . __("You are about to delete this link.\\n \'Cancel\' to stop, \'OK\' to delete.") . "');" . '" class="delete">' . __('Delete') . '</a></td>';
! echo '<td><input type="checkbox" name="linkcheck[]" value="' . $link->link_id . '" /></td>';
} else {
echo "<td> </td><td> </td><td> </td>\n";
--- 725,733 ----
if ($show_buttons) {
! echo <<<LINKS
! <td><a href="link-manager.php?link_id=$link->link_id&action=linkedit" class="edit">Edit</a></td>
! <td><a href="link-manager.php?link_id=$link->link_id&action=Delete" onclick="return confirm('You are about to delete this link.\\n \'Cancel\' to stop, \'OK\' to delete.');" class="delete">Delete</a></td>
! <td><input type="checkbox" name="linkcheck[]" value="$link->link_id" /></td>
! LINKS;
} else {
echo "<td> </td><td> </td><td> </td>\n";
Index: profile.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/profile.php,v
retrieving revision 1.19.4.1
retrieving revision 1.19.4.2
diff -C2 -d -r1.19.4.1 -r1.19.4.2
*** profile.php 28 May 2004 03:50:18 -0000 1.19.4.1
--- profile.php 5 Oct 2004 22:39:07 -0000 1.19.4.2
***************
*** 345,355 ****
}
</script>
! <strong><?php _e('SideBar') ?></strong><br />
! <?php _e('Add the <a href="#" onClick="addPanel()">WordPress Sidebar</a>!') ?>
<?php } elseif (($is_winIE) || ($is_macIE)) { ?>
! <strong><?php _e('SideBar') ?></strong><br />
! <?php __('Add this link to your favorites:') ?><br />
! <a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(_search=open('<?php echo get_settings('siteurl');
! ?>/wp-admin/sidebar.php?text='+escape(Q)+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'_search'))"><?php _e('WordPress Sidebar') ?></a>.
</div>
--- 345,356 ----
}
</script>
! <strong>SideBar</strong><br />
! Add the <a href="#" onClick="addPanel()">WordPress Sidebar</a>!
<?php } elseif (($is_winIE) || ($is_macIE)) { ?>
! <strong>SideBar</strong><br />
! Add this link to your favorites:<br />
! <a href="javascript:Q='';if(top.frames.length==0)Q=document.selection.createRange().text;void(_search=open('<?php echo get_settings('siteurl');
! ?>/wp-admin/sidebar.php?text='+escape(Q)+'&popupurl='+escape(location.href)+'&popuptitle='+escape(document.title),'_search'))">WordPress
! Sidebar</a>.
</div>
Index: post.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/post.php,v
retrieving revision 1.59.4.1
retrieving revision 1.59.4.2
diff -C2 -d -r1.59.4.1 -r1.59.4.2
*** post.php 28 May 2004 03:50:18 -0000 1.59.4.1
--- post.php 5 Oct 2004 22:39:06 -0000 1.59.4.2
***************
*** 774,779 ****
<br />
<br />
! <?php _e('One-click bookmarklet:') ?><br />
! <a href="javascript:oneclickbookmarklet(0);"><?php _e('click here') ?></a>
<?php
} else if ($is_opera) {
--- 774,779 ----
<br />
<br />
! One-click bookmarklet:<br />
! <a href="javascript:oneclickbookmarklet(0);">click here</a>
<?php
} else if ($is_opera) {
Index: upload.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-admin/upload.php,v
retrieving revision 1.14.4.1
retrieving revision 1.14.4.2
diff -C2 -d -r1.14.4.1 -r1.14.4.2
*** upload.php 2 Oct 2004 00:47:42 -0000 1.14.4.1
--- upload.php 5 Oct 2004 22:39:07 -0000 1.14.4.2
***************
*** 81,93 ****
<?php //Makes sure they choose a file
! //print_r($_FILES);
//die();
! $imgalt = basename( (isset($_POST['imgalt'])) ? $_POST['imgalt'] : '' );
! $img1_name = (strlen($imgalt)) ? $imgalt : basename( $_FILES['img1']['name'] );
! $img1_type = (strlen($imgalt)) ? $_POST['img1_type'] : $_FILES['img1']['type'];
! $imgdesc = htmlentities2($imgdesc);
$imgtype = explode(".",$img1_name);
--- 81,93 ----
<?php //Makes sure they choose a file
! //print_r($HTTP_POST_FILES);
//die();
! $imgalt = (isset($_POST['imgalt'])) ? $_POST['imgalt'] : $imgalt;
! $img1_name = (strlen($imgalt)) ? $_POST['imgalt'] : $HTTP_POST_FILES['img1']['name'];
! $img1_type = (strlen($imgalt)) ? $_POST['img1_type'] : $HTTP_POST_FILES['img1']['type'];
! $imgdesc = str_replace('"', '&quot;', $_POST['imgdesc']);
$imgtype = explode(".",$img1_name);
***************
*** 100,107 ****
if (strlen($imgalt)) {
$pathtofile = get_settings('fileupload_realpath')."/".$imgalt;
! $img1 = $_POST['img1']['tmp_name'];
} else {
$pathtofile = get_settings('fileupload_realpath')."/".$img1_name;
! $img1 = $_FILES['img1']['tmp_name'];
}
--- 100,107 ----
if (strlen($imgalt)) {
$pathtofile = get_settings('fileupload_realpath')."/".$imgalt;
! $img1 = $_POST['img1'];
} else {
$pathtofile = get_settings('fileupload_realpath')."/".$img1_name;
! $img1 = $HTTP_POST_FILES['img1']['tmp_name'];
}
***************
*** 172,176 ****
}
// Still couldn't get it. Give up.
! if (!$moved) {
die(sprintf(__("Couldn't upload your file to %s."), $pathtofile));
} else {
--- 172,176 ----
}
// Still couldn't get it. Give up.
! if (!moved) {
die(sprintf(__("Couldn't upload your file to %s."), $pathtofile));
} else {
***************
*** 192,196 ****
}
elseif($_POST['thumbsize'] == 'custom') {
! $max_side = intval($_POST['imgthumbsizecustom']);
}
--- 192,196 ----
}
elseif($_POST['thumbsize'] == 'custom') {
! $max_side = $_POST['imgthumbsizecustom'];
}
- Previous message: [wp-cvs] wordpress/wp-content link-update-cache.xml, 1.1.4.1,
1.1.4.2
- Next message: [wp-cvs] wordpress/wp-includes functions-formatting.php, 1.30.4.1,
1.30.4.2 functions.php, 1.101.4.2, 1.101.4.3 links.php,
1.12.4.1, 1.12.4.2 version.php, 1.15.4.1, 1.15.4.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cvs
mailing list