Skip to content

Commit

Permalink
Merge pull request #4501 from Sesquipedalian/2018
Browse files Browse the repository at this point in the history
Updates year to 2018
  • Loading branch information
Sesquipedalian committed Jan 20, 2018
2 parents 9e95b1b + fc9c1c7 commit de7e49f
Show file tree
Hide file tree
Showing 208 changed files with 254 additions and 254 deletions.
2 changes: 1 addition & 1 deletion SSI.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Attachments.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/BoardIndex.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/CacheAPI-apc.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/CacheAPI-apcu.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/CacheAPI-memcache.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/CacheAPI-memcached.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
18 changes: 9 additions & 9 deletions Sources/CacheAPI-postgres.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand All @@ -24,7 +24,7 @@ class postgres_cache extends cache_api
* @var false|resource of the pg_prepare from get_data.
*/
private $pg_get_data_prep;

/**
* @var false|resource of the pg_prepare from put_data.
*/
Expand All @@ -42,15 +42,15 @@ public function connect()
{
global $db_prefix, $db_connection;

pg_prepare($db_connection, '', 'SELECT 1
pg_prepare($db_connection, '', 'SELECT 1
FROM pg_tables
WHERE schemaname = $1
AND tablename = $2');

$result = pg_execute($db_connection, '', array('public', $db_prefix . 'cache'));

if (pg_affected_rows($result) === 0)
pg_query($db_connection, 'CREATE UNLOGGED TABLE {db_prefix}cache (key text, value text, ttl bigint, PRIMARY KEY (key))');
pg_query($db_connection, 'CREATE UNLOGGED TABLE {db_prefix}cache (key text, value text, ttl bigint, PRIMARY KEY (key))');
}

/**
Expand All @@ -65,10 +65,10 @@ public function isSupported($test = false)

$result = pg_query($db_connection, 'SHOW server_version_num');
$res = pg_fetch_assoc($result);

if ($res['server_version_num'] < 90500)
return false;

return $test ? true : parent::isSupported();
}

Expand All @@ -80,12 +80,12 @@ public function getData($key, $ttl = null)
global $db_prefix, $db_connection;

$ttl = time() - $ttl;

if (empty($this->pg_get_data_prep))
$this->pg_get_data_prep = pg_prepare($db_connection, 'smf_cache_get_data', 'SELECT value FROM ' . $db_prefix . 'cache WHERE key = $1 AND ttl >= $2 LIMIT 1');

$result = pg_execute($db_connection, 'smf_cache_get_data', array($key, $ttl));

if (pg_affected_rows($result) === 0)
return null;

Expand Down
2 changes: 1 addition & 1 deletion Sources/CacheAPI-smf.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/CacheAPI-sqlite.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/CacheAPI-xcache.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/CacheAPI-zend.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Calendar.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Class-BrowserDetect.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Class-CacheAPI.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Class-CurlFetchWeb.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Class-Graphics.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Class-Package.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Class-SearchAPI.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Class-TOTP.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/DbExtra-mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/DbExtra-postgresql.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
4 changes: 2 additions & 2 deletions Sources/DbPackages-mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down Expand Up @@ -199,7 +199,7 @@ function smf_db_create_table($table_name, $columns, $indexes = array(), $paramet

// Fill the old data
if ($old_table_exists)
{
{
$same_col = array();

$request = $smcFunc['db_query']('','
Expand Down
6 changes: 3 additions & 3 deletions Sources/DbPackages-postgresql.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down Expand Up @@ -153,8 +153,8 @@ function smf_db_create_table($table_name, $columns, $indexes = array(), $paramet
'security_override' => true,
)
);
if (!$old_table_exists)

if (!$old_table_exists)
$smcFunc['db_query']('', '
CREATE SEQUENCE ' . $table_name . '_seq',
array(
Expand Down
2 changes: 1 addition & 1 deletion Sources/DbSearch-mysql.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/DbSearch-postgresql.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Display.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Drafts.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Errors.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Groups.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Help.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Likes.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Load.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/LogInOut.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
2 changes: 1 addition & 1 deletion Sources/Logging.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
*
* @package SMF
* @author Simple Machines http://www.simplemachines.org
* @copyright 2017 Simple Machines and individual contributors
* @copyright 2018 Simple Machines and individual contributors
* @license http://www.simplemachines.org/about/smf/license.php BSD
*
* @version 2.1 Beta 4
Expand Down
Loading

0 comments on commit de7e49f

Please sign in to comment.