Revert "Added integration hooks for knownInts and knownFloats"

This reverts commit 22b4fad.
SimpleMachines · 1488b56f2ce783bd5786fdc050834c3a2a8e2d09 · Jul 23, 2012
commit 1488b56f2ce783bd5786fdc050834c3a2a8e2d09
1 parent 22b4fad
@@ -1,179 +0,0 @@
-<?php
-
-/**
- * The settings file contains all of the basic settings that need to be present when a database/cache is not available.
- * 
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines http://www.simplemachines.org
- * @copyright 2011 Simple Machines
- * @license http://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 2.1 Alpha 1
- */
-
-########## Maintenance ##########
-/**
- * The maintenance "mode"
- * Set to 1 to enable Maintenance Mode, 2 to make the forum untouchable. (you'll have to make it 0 again manually!)
- * 0 is default and disables maintenance mode.
- * @var int 0, 1, 2
- * @global int $maintenance
- */
-$maintenance = 0;
-/**
- * Title for the Maintenance Mode message.
- * @var string
- * @global int $mtitle
- */
-$mtitle = 'Maintenance Mode';
-/**
- * Description of why the forum is in maintenance mode.
- * @var string
- * @global string $mmessage
- */
-$mmessage = 'Okay faithful users...we\'re attempting to restore an older backup of the database...news will be posted once we\'re back!';
-
-########## Forum Info ##########
-/**
- * The name of your forum.
- * @var string
- */
-$mbname = 'My Community';
-/**
- * The default language file set for the forum.
- * @var string
- */
-$language = 'english';
-/**
- * URL to your forum's folder. (without the trailing /!)
- * @var string
- */
-$boardurl = 'http://localhost/smf2.1';
-/**
- * Email address to send emails from. (like noreply@yourdomain.com.)
- * @var string
- */
-$webmaster_email = 'nibogo@nibogo.com';
-/**
- * Name of the cookie to set for authentication.
- * @var string
- */
-$cookiename = 'SMFCookie970';
-
-########## Database Info ##########
-/**
- * The database type
- * Default options: mysql, sqlite, postgresql
- * @var string
- */
-$db_type = 'mysql';
-/**
- * The server to connect to (or a Unix socket)
- * @var string
- */
-$db_server = 'localhost';
-/**
- * The database name
- * @var string
- */
-$db_name = '2.1_github';
-/**
- * Database username
- * @var string
- */
-$db_user = 'root';
-/**
- * Database password
- * @var string
- */
-$db_passwd = '';
-/**
- * Database user for when connecting with SSI
- * @var string
- */
-$ssi_db_user = '';
-/**
- * Database password for when connecting with SSI
- * @var string
- */
-$ssi_db_passwd = '';
-/**
- * A prefix to put in front of your table names.
- * This helps to prevent conflicts
- * @var string
- */
-$db_prefix = 'smf_';
-/**
- * Use a persistent database connection
- * @var int|bool
- */
-$db_persist = 0;
-/**
- * 
- * @var int|bool
- */
-$db_error_send = 0;
-
-########## Cache Info ##########
-/**
- * Select a cache system. You want to leave this up to the cache area of the admin panel for 
- * proper detection of apc, eaccelerator, memcache, mmcache, output_cache, smf, or xcache 
- * (you can add more with a mod).
- * @var string
- */
-$cache_accelerator = '';
-/**
- * The level at which you would like to cache. Between 0 (off) through 3 (cache a lot).
- * @var int
- */
-$cache_enable = 0;
-/**
- * This is only used for memcache / memcached. Should be a string of 'server:port,server:port'
- * @var array
- */
-$cache_memcached = '';
-/**
- * This is only for the 'smf' file cache system. It is the path to the cache directory.
- * It is also recommended that you place this in /tmp/ if you are going to use this.
- * @var string
- */
-$cachedir = '/Applications/XAMPP/xamppfiles/htdocs/smf2.1/cache';
-
-########## Directories/Files ##########
-# Note: These directories do not have to be changed unless you move things.
-/**
- * The absolute path to the forum's folder. (not just '.'!)
- * @var string
- */
-$boarddir = '/Applications/XAMPP/xamppfiles/htdocs/smf2.1';
-/**
- * Path to the Sources directory.
- * @var string
- */
-$sourcedir = '/Applications/XAMPP/xamppfiles/htdocs/smf2.1/Sources';
-
-########## Error-Catching ##########
-# Note: You shouldn't touch these settings.
-if (file_exists(dirname(__FILE__) . '/db_last_error.php'))
-	include(dirname(__FILE__) . '/db_last_error.php'); 
-
-if (!isset($db_last_error))
-{
-	// File does not exist so lets try to create it
-	file_put_contents(dirname(__FILE__) . '/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>');
-	$db_last_error = 0; 
-}
-
-
-# Make sure the paths are correct... at least try to fix them.
-if (!file_exists($boarddir) && file_exists(dirname(__FILE__) . '/agreement.txt'))
-	$boarddir = dirname(__FILE__);
-if (!file_exists($sourcedir) && file_exists($boarddir . '/Sources'))
-	$sourcedir = $boarddir . '/Sources';
-if (!file_exists($cachedir) && file_exists($boarddir . '/cache'))
-	$cachedir = $boarddir . '/cache';
-
-$db_character_set = 'utf8';
-?>
@@ -1,179 +0,0 @@
-<?php
-
-/**
- * The settings file contains all of the basic settings that need to be present when a database/cache is not available.
- * 
- * Simple Machines Forum (SMF)
- *
- * @package SMF
- * @author Simple Machines http://www.simplemachines.org
- * @copyright 2011 Simple Machines
- * @license http://www.simplemachines.org/about/smf/license.php BSD
- *
- * @version 2.1 Alpha 1
- */
-
-########## Maintenance ##########
-/**
- * The maintenance "mode"
- * Set to 1 to enable Maintenance Mode, 2 to make the forum untouchable. (you'll have to make it 0 again manually!)
- * 0 is default and disables maintenance mode.
- * @var int 0, 1, 2
- * @global int $maintenance
- */
-$maintenance = 0;
-/**
- * Title for the Maintenance Mode message.
- * @var string
- * @global int $mtitle
- */
-$mtitle = 'Maintenance Mode';
-/**
- * Description of why the forum is in maintenance mode.
- * @var string
- * @global string $mmessage
- */
-$mmessage = 'Okay faithful users...we\'re attempting to restore an older backup of the database...news will be posted once we\'re back!';
-
-########## Forum Info ##########
-/**
- * The name of your forum.
- * @var string
- */
-$mbname = 'My Community';
-/**
- * The default language file set for the forum.
- * @var string
- */
-$language = 'english';
-/**
- * URL to your forum's folder. (without the trailing /!)
- * @var string
- */
-$boardurl = 'http://localhost/smf2.1';
-/**
- * Email address to send emails from. (like noreply@yourdomain.com.)
- * @var string
- */
-$webmaster_email = 'nibogo@nibogo.com';
-/**
- * Name of the cookie to set for authentication.
- * @var string
- */
-$cookiename = 'SMFCookie970';
-
-########## Database Info ##########
-/**
- * The database type
- * Default options: mysql, sqlite, postgresql
- * @var string
- */
-$db_type = 'mysql';
-/**
- * The server to connect to (or a Unix socket)
- * @var string
- */
-$db_server = 'localhost';
-/**
- * The database name
- * @var string
- */
-$db_name = '2.1_github';
-/**
- * Database username
- * @var string
- */
-$db_user = 'root';
-/**
- * Database password
- * @var string
- */
-$db_passwd = '';
-/**
- * Database user for when connecting with SSI
- * @var string
- */
-$ssi_db_user = '';
-/**
- * Database password for when connecting with SSI
- * @var string
- */
-$ssi_db_passwd = '';
-/**
- * A prefix to put in front of your table names.
- * This helps to prevent conflicts
- * @var string
- */
-$db_prefix = 'smf_';
-/**
- * Use a persistent database connection
- * @var int|bool
- */
-$db_persist = 0;
-/**
- * 
- * @var int|bool
- */
-$db_error_send = 0;
-
-########## Cache Info ##########
-/**
- * Select a cache system. You want to leave this up to the cache area of the admin panel for 
- * proper detection of apc, eaccelerator, memcache, mmcache, output_cache, smf, or xcache 
- * (you can add more with a mod).
- * @var string
- */
-$cache_accelerator = '';
-/**
- * The level at which you would like to cache. Between 0 (off) through 3 (cache a lot).
- * @var int
- */
-$cache_enable = 0;
-/**
- * This is only used for memcache / memcached. Should be a string of 'server:port,server:port'
- * @var array
- */
-$cache_memcached = '';
-/**
- * This is only for the 'smf' file cache system. It is the path to the cache directory.
- * It is also recommended that you place this in /tmp/ if you are going to use this.
- * @var string
- */
-$cachedir = '/Applications/XAMPP/xamppfiles/htdocs/smf2.1/cache';
-
-########## Directories/Files ##########
-# Note: These directories do not have to be changed unless you move things.
-/**
- * The absolute path to the forum's folder. (not just '.'!)
- * @var string
- */
-$boarddir = '/Applications/XAMPP/xamppfiles/htdocs/smf2.1';
-/**
- * Path to the Sources directory.
- * @var string
- */
-$sourcedir = '/Applications/XAMPP/xamppfiles/htdocs/smf2.1/Sources';
-
-########## Error-Catching ##########
-# Note: You shouldn't touch these settings.
-if (file_exists(dirname(__FILE__) . '/db_last_error.php'))
-	include(dirname(__FILE__) . '/db_last_error.php'); 
-
-if (!isset($db_last_error))
-{
-	// File does not exist so lets try to create it
-	file_put_contents(dirname(__FILE__) . '/db_last_error.php', '<' . '?' . "php\n" . '$db_last_error = 0;' . "\n" . '?' . '>');
-	$db_last_error = 0; 
-}
-
-
-# Make sure the paths are correct... at least try to fix them.
-if (!file_exists($boarddir) && file_exists(dirname(__FILE__) . '/agreement.txt'))
-	$boarddir = dirname(__FILE__);
-if (!file_exists($sourcedir) && file_exists($boarddir . '/Sources'))
-	$sourcedir = $boarddir . '/Sources';
-if (!file_exists($cachedir) && file_exists($boarddir . '/cache'))
-	$cachedir = $boarddir . '/cache';
-
-$db_character_set = 'utf8';
-?>
@@ -341,9 +341,6 @@ function updateMemberData($members, $data)
 	$knownFloats = array(
 		'time_offset',
 	);
-	
-	// Allow mods access for knownInts and knownFloats
-	call_integration_hook('integrate_known_numbers', array(&$knownInts, &$knownFloats));
 
 	$setString = '';
 	foreach ($data as $var => $val)