aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-09-18 21:20:54 -0700
committerfriendica <info@friendica.com>2013-09-18 21:20:54 -0700
commit5607737c395c32a0c9f0ee071c571f6a7509f8eb (patch)
tree3f0ac480eb7404597f37d48391bbc59bbd5977fc
parente4d2e2200e04c8df699d9a8efade661123ef7ac8 (diff)
downloadvolse-hubzilla-5607737c395c32a0c9f0ee071c571f6a7509f8eb.tar.gz
volse-hubzilla-5607737c395c32a0c9f0ee071c571f6a7509f8eb.tar.bz2
volse-hubzilla-5607737c395c32a0c9f0ee071c571f6a7509f8eb.zip
set default charset of email_header_encode, add ud_flags to indicate which updates have been processed in some way.
-rwxr-xr-xboot.php2
-rw-r--r--include/network.php2
-rw-r--r--install/database.sql4
-rw-r--r--install/update.php10
4 files changed, 14 insertions, 4 deletions
diff --git a/boot.php b/boot.php
index 1bbdd0e52..ec1184e4e 100755
--- a/boot.php
+++ b/boot.php
@@ -44,7 +44,7 @@ require_once('include/taxonomy.php');
define ( 'RED_PLATFORM', 'Red Matrix' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 );
-define ( 'DB_UPDATE_VERSION', 1070 );
+define ( 'DB_UPDATE_VERSION', 1071 );
define ( 'EOL', '<br />' . "\r\n" );
define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' );
diff --git a/include/network.php b/include/network.php
index 00d931f19..99a0a8e2b 100644
--- a/include/network.php
+++ b/include/network.php
@@ -1336,7 +1336,7 @@ function xml2array($contents, $namespaces = true, $get_attributes=1, $priority =
}
-function email_header_encode($in_str, $charset) {
+function email_header_encode($in_str, $charset = 'UTF-8') {
$out_str = $in_str;
$need_to_convert = false;
diff --git a/install/database.sql b/install/database.sql
index 2e420fcbd..21d7575e9 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -891,10 +891,12 @@ CREATE TABLE IF NOT EXISTS `updates` (
`ud_hash` char(128) NOT NULL,
`ud_guid` char(255) NOT NULL DEFAULT '',
`ud_date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `ud_flags` int(11) NOT NULL DEFAULT '0',
PRIMARY KEY (`ud_id`),
KEY `ud_hash` (`ud_hash`),
KEY `ud_guid` (`ud_guid`),
- KEY `ud_date` (`ud_date`)
+ KEY `ud_date` (`ud_date`),
+ KEY `ud_flags` (`ud_flags`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `verify` (
diff --git a/install/update.php b/install/update.php
index 3c40ee0c5..c135cc586 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1070 );
+define( 'UPDATE_VERSION' , 1071 );
/**
*
@@ -797,3 +797,11 @@ ADD INDEX ( `site_sellpage` )");
return UPDATE_FAILED;
}
+function update_r1070() {
+ $r = q("ALTER TABLE `updates` ADD `ud_flags` INT NOT NULL DEFAULT '0',
+ADD INDEX ( `ud_flags` )");
+ if($r)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+}
+