mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into ticket/11271-develop

Browse Source 
# By Vjacheslav Trushkin (148) and others
# Via Joas Schilling (50) and others
* develop: (635 commits)
  [ticket/12079] Add default value to $multibyte in request.untrimmed_variable().
  [ticket/11849] Fix more function calls
  [ticket/11849] Update more MCP calls to pagination class
  [ticket/11849] Update some ACP modules with new pagination
  [ticket/11849] Update rest of the UCP modules
  [ticket/11849] Update UCP notifications and pm folder
  [ticket/11849] Update search and memberlist
  [ticket/11849] Update pagination in viewonline.php
  [ticket/11849] Remove old pagination test
  [ticket/11849] Update pagination code in viewtopic.php
  [ticket/11849] Replace pagination in viewforum.php with class
  [ticket/11849] Add service definition
  [ticket/11849] Remove pagination functions
  [ticket/11849] Test validate_start and on_page
  [ticket/11849] Move pagination code to class
  [ticket/12060] A little less verbose cleanup of event docblocks
  [ticket/12060] Further clarifying new event docblocks as much as possible
  [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event
  [ticket/12060] Remove whitespaces
  [ticket/12060] Fix docblock for acp_bbcodes_modify_create event
  ...
This commit is contained in:
Dhruv
2013-12-27 00:28:38 +05:30
parent 1bb175ce77 f9c7f0fc19
commit 80c05e861b
602 changed files with 13033 additions and 5940 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/phpbb/feed/base.php
View File

@@ -9,14 +9,6 @@
namespace phpbb\feed;
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* Base class with some generic functions and settings.
*
@@ -150,7 +142,7 @@ abstract class base
*/
function get($key)
{
return (isset($this->keys[$key])) ? $this->keys[$key] : NULL;
return (isset($this->keys[$key])) ? $this->keys[$key] : null;
}
function get_readable_forums()

8
phpBB/phpbb/feed/factory.php
View File

@@ -9,14 +9,6 @@
namespace phpbb\feed;
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* Factory class to return correct object
* @package phpBB3

10
phpBB/phpbb/feed/forum.php
View File

@@ -9,14 +9,6 @@
namespace phpbb\feed;
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* Forum feed
*
@@ -36,7 +28,7 @@ class forum extends \phpbb\feed\post_base
* @param int $forum_id Forum ID
* @return \phpbb\feed\forum
*/
public function set_forum_id($topic_id)
public function set_forum_id($forum_id)
{
$this->forum_id = (int) $forum_id;

8
phpBB/phpbb/feed/forums.php
View File

@@ -9,14 +9,6 @@
namespace phpbb\feed;
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* 'All Forums' feed
*

8
phpBB/phpbb/feed/helper.php
View File

@@ -9,14 +9,6 @@
namespace phpbb\feed;
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* Class with some helpful functions used in feeds
* @package phpBB3

8
phpBB/phpbb/feed/news.php
View File

@@ -9,14 +9,6 @@
namespace phpbb\feed;
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* News feed
*

8
phpBB/phpbb/feed/overall.php
View File

@@ -9,14 +9,6 @@
namespace phpbb\feed;
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* Board wide feed (aka overall feed)
*

8
phpBB/phpbb/feed/post_base.php
View File

@@ -9,14 +9,6 @@
namespace phpbb\feed;
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* Abstract class for post based feeds
*

8
phpBB/phpbb/feed/topic.php
View File

@@ -9,14 +9,6 @@
namespace phpbb\feed;
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* Topic feed for a specific topic
*

8
phpBB/phpbb/feed/topic_base.php
View File

@@ -9,14 +9,6 @@
namespace phpbb\feed;
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* Abstract class for topic based feeds
*

8
phpBB/phpbb/feed/topics.php
View File

@@ -9,14 +9,6 @@
namespace phpbb\feed;
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* New Topics feed
*

8
phpBB/phpbb/feed/topics_active.php
View File

@@ -9,14 +9,6 @@
namespace phpbb\feed;
/**
* @ignore
*/
if (!defined('IN_PHPBB'))
{
exit;
}
/**
* Active Topics feed
*