aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/common.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2004-09-16 18:33:22 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2004-09-16 18:33:22 +0000
commit2fa463cdeb5d8e4f2373aa834154ca27ea21c97a (patch)
tree87059418d9b487f76bf1c99ae7ec3184a62cd8ef /phpBB/common.php
parentd80f8d577ebdc1489b2dcf49bdb9a266d29d1ef1 (diff)
downloadforums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.tar
forums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.tar.gz
forums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.tar.bz2
forums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.tar.xz
forums-2fa463cdeb5d8e4f2373aa834154ca27ea21c97a.zip
- more updates, mostly bugfixes to the bbcode parser
- changed current_user in sessions (please review) - give more flexibility to style authors in regard to the pagination elements - profile fields updates (included a sample constuct into viewtopic_body.html - have to be documented extensivly) - code optimizations (use of strpos, sizeof, loops not iterating functions on every call, memory savings...) - and last but not least --- hopefully not introduced more bugs than healthy (*cough*) git-svn-id: file:///svn/phpbb/trunk@4984 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/common.php')
-rw-r--r--phpBB/common.php19
1 files changed, 14 insertions, 5 deletions
diff --git a/phpBB/common.php b/phpBB/common.php
index 13ce9e45e2..efcb6eeb68 100644
--- a/phpBB/common.php
+++ b/phpBB/common.php
@@ -40,6 +40,15 @@ if (!defined('PHPBB_INSTALLED'))
exit;
}
+if (defined('DEBUG_EXTRA'))
+{
+ $base_memory_usage = 0;
+ if (function_exists('memory_get_usage'))
+ {
+ $base_memory_usage = memory_get_usage();
+ }
+}
+
// Load Extensions
if (!empty($load_extensions))
{
@@ -138,11 +147,11 @@ define('INLINE_LINK', 1);
define('PHYSICAL_LINK', 2);
// Categories - Attachments
-define('NONE_CAT', 0);
-define('IMAGE_CAT', 1); // Inline Images
-define('WM_CAT', 2); // Windows Media Files - Streaming
-define('RM_CAT', 3); // Real Media Files - Streaming
-define('THUMB_CAT', 4); // Not used within the database, only while displaying posts
+define('ATTACHMENT_CATEGORY_NONE', 0);
+define('ATTACHMENT_CATEGORY_IMAGE', 1); // Inline Images
+define('ATTACHMENT_CATEGORY_WM', 2); // Windows Media Files - Streaming
+define('ATTACHMENT_CATEGORY_RM', 3); // Real Media Files - Streaming
+define('ATTACHMENT_CATEGORY_THUMB', 4); // Not used within the database, only while displaying posts
//define('SWF_CAT', 5); // Replaced by [flash]? or an additional possibility?
// BBCode UID length