Version 3.4.5
This commit is contained in:
1 parent
fb6b5baabc
commit
e4478369d8
1360 files changed
+228921
-179445
No files matched your search
@@ -2,19 +2,19 @@
|
||||
/**
|
||||
* <pre>
|
||||
* Invision Power Services
|
||||
* IP.Board v3.3.4
|
||||
* IP.Board v3.4.5
|
||||
* Posting
|
||||
* Last Updated: $Date: 2012-06-12 10:14:49 -0400 (Tue, 12 Jun 2012) $
|
||||
* Last Updated: $Date: 2013-01-29 18:38:34 -0500 (Tue, 29 Jan 2013) $
|
||||
* </pre>
|
||||
* File Created By: Matt Mecham
|
||||
*
|
||||
* @author $Author: bfarber $
|
||||
* @author $Author: AndyMillne $
|
||||
* @copyright (c) 2001 - 2009 Invision Power Services, Inc.
|
||||
* @license http://www.invisionpower.com/company/standards.php#license
|
||||
* @package IP.Board
|
||||
* @subpackage Forums
|
||||
* @link http://www.invisionpower.com
|
||||
* @version $Rev: 10914 $
|
||||
* @version $Rev: 11914 $
|
||||
*/
|
||||
|
||||
if ( ! defined( 'IN_IPB' ) )
|
||||
@@ -66,7 +66,7 @@ class public_forums_post_post extends ipsCommand
|
||||
// Make sure our input doCode element is legal.
|
||||
//-----------------------------------------
|
||||
|
||||
if ( ! isset( $doCodes[ $do ] ) )
|
||||
if ( ! is_string( $do ) || ! isset( $doCodes[ $do ] ) )
|
||||
{
|
||||
$this->registry->getClass('output')->showError( 'posting_bad_action', 103125 );
|
||||
}
|
||||
@@ -257,40 +257,15 @@ class public_forums_post_post extends ipsCommand
|
||||
{
|
||||
ipsRegistry::getClass('output')->silentRedirect( "{$this->settings['base_url']}t={$topic['tid']}&f={$topic['forum_id']}&auth_key={$this->memberData['form_hash']}&app=forums&module=moderate&section=moderate&do=02" );
|
||||
}
|
||||
/* Bug #40789 This is no longer required since findpost additions in 3.4
|
||||
else if ( $this->settings['post_order_sort'] == 'desc' )
|
||||
{
|
||||
ipsRegistry::getClass('output')->silentRedirect( $this->settings['base_url']."showtopic=" . $this->_postClass->getTopicID() . "&#entry" . $this->_postClass->getPostID(), $topic['title_seo'] );
|
||||
}
|
||||
*/
|
||||
else
|
||||
{
|
||||
$permissions['softDelete'] = $this->registry->getClass('class_forums')->canSoftDeletePosts( $topic['forum_id'], $topic );
|
||||
$permissions['softDeleteSee'] = $this->registry->getClass('class_forums')->canSeeSoftDeletedPosts( $topic['forum_id'] );
|
||||
|
||||
$posts = $topic['posts'] + 1;
|
||||
|
||||
if( $this->moderator['post_q'] OR $this->memberData['g_is_supmod'] )
|
||||
{
|
||||
$posts += $topic['topic_queuedposts'];
|
||||
}
|
||||
|
||||
if ( $permissions['softDelete'] AND $permissions['softDeleteSee'] )
|
||||
{
|
||||
$posts += $topic['topic_deleted_posts'];
|
||||
}
|
||||
|
||||
if( ( $posts % $this->settings['display_max_posts'] ) == 0 )
|
||||
{
|
||||
$page = ( ($posts) / $this->settings['display_max_posts'] );
|
||||
}
|
||||
else
|
||||
{
|
||||
$page = ( ($posts) / $this->settings['display_max_posts'] );
|
||||
$page = ceil($page) - 1;
|
||||
}
|
||||
|
||||
$page = $page * $this->settings['display_max_posts'];
|
||||
|
||||
ipsRegistry::getClass('output')->silentRedirect( $this->settings['base_url']."showtopic={$topic['tid']}&st=$page&gopid={$post['pid']}&#entry{$post['pid']}", $topic['title_seo'] );
|
||||
ipsRegistry::getClass('output')->silentRedirect( $this->settings['base_url']."showtopic={$topic['tid']}&p={$post['pid']}", $topic['title_seo'] );
|
||||
}
|
||||
}
|
||||
catch( Exception $error )
|
||||
@@ -349,7 +324,7 @@ class public_forums_post_post extends ipsCommand
|
||||
}
|
||||
|
||||
# Redirect
|
||||
ipsRegistry::getClass('output')->redirectScreen( $this->lang->words['post_edited'], $this->settings['base_url'] . "showtopic={$topic['tid']}&st=" . $this->request['st'] . "#entry{$post['pid']}", $topic['title_seo'] );
|
||||
ipsRegistry::getClass('output')->redirectScreen( $this->lang->words['post_edited'], $this->settings['base_url'] . "showtopic={$topic['tid']}&st=" . $this->request['st'] . "&p={$post['pid']}", $topic['title_seo'] );
|
||||
|
||||
}
|
||||
catch( Exception $error )
|
||||
|
||||
Reference in new issue
Block a user