[php-blog-cvs] serendipity comment.php,1.55,1.56 serendipity_admin.php,1.49,1.50

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3471

Modified Files:
	comment.php serendipity_admin.php 
Log Message:
* fix entering comments in popup screen, wrong variable
* move blogtitle/Description out of personal settings and into config again, make config available to chief editors again (even though they now only can change 2 settings)



Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- serendipity_admin.php	2 Dec 2004 11:46:35 -0000	1.49
+++ serendipity_admin.php	2 Dec 2004 12:23:08 -0000	1.50
@@ -173,7 +173,7 @@
                     <div class="serendipitySideBarItem">
                         <div class="serendipitySideBarTitle"><?php echo ADMIN; ?></div>
                         <div class="serendipitySideBarContent">
-<?php if ($serendipity['serendipityUserlevel'] > USERLEVEL_CHIEF) { ?>
+<?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
                             &bull; <a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a><br />
 <?php } ?>
 <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- comment.php	2 Dec 2004 10:54:29 -0000	1.55
+++ comment.php	2 Dec 2004 12:23:08 -0000	1.56
@@ -78,7 +78,6 @@
     }
 } else {
     $id = (int)(!empty($serendipity['POST']['entry_id']) ? $serendipity['POST']['entry_id'] : $serendipity['GET']['entry_id']);
-
     $serendipity['head_subtitle'] = COMMENTS;
     $serendipity['smarty_file'] = 'commentpopup.tpl';
     serendipity_smarty_init();
@@ -134,7 +133,7 @@
         $comment['parent_id'] = $serendipity['POST']['replyTo'];
         if (!empty($comment['comment'])) {
             if (serendipity_saveComment($id, $comment, 'NORMAL')) {
-                $sc_url = $serendipity['baseURL'] . 'comment.php?entry_id=' . $id . '&success=true&url=' . urlencode($_SERVER['HTTP_REFERER']);
+                $sc_url = $serendipity['baseURL'] . 'comment.php?serendipity[entry_id]=' . $id . '&success=true&url=' . urlencode($_SERVER['HTTP_REFERER']);
                 if (serendipity_isResponseClean($sc_url)) {
                     header('Location: ' . $sc_url);
                 }