harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/redmatrix/redmatrix into pending_merge

Browse Source 
Conflicts:
	boot.php
	install/update.php
This commit is contained in:
redmatrix 2015-11-06 12:43:51 -08:00
commit 9a42d63516
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boot.php
View File

@ -50,7 +50,8 @@ define ( 'PLATFORM_NAME', 'hubzilla' );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H'); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'H');
define ( 'ZOT_REVISION', 1 ); define ( 'ZOT_REVISION', 1 );
define ( 'DB_UPDATE_VERSION', 1159 ); define ( 'DB_UPDATE_VERSION', 1160 );
/** /**
* @brief Constant with a HTML line break. * @brief Constant with a HTML line break.

20
install/update.php
View File

@ -1,6 +1,6 @@
<?php <?php
define( 'UPDATE_VERSION' , 1159 ); define( 'UPDATE_VERSION' , 1160 );
/** /**
* *
@ -1932,3 +1932,21 @@ function update_r1158() {
} }
function update_r1159() {
$r = q("select attach.id, attach.data, attach.hash, channel_address from attach left join channel on attach.uid = channel_id where os_storage = 1 ");
if($r) {
foreach($r as $rr) {
$x = dbunescbin($rr['data']);
$has_slash = (($x === 'store/' . $rr['channel_address'] . '/') ? true : false);
if(($x === 'store/' . $rr['channel_address']) || ($has_slash)) {
q("update attach set data = '%s' where id = %d",
dbesc('store/' . $rr['channel_address']. (($has_slash) ? '' : '/' . $rr['hash'])),
dbesc($rr['id'])
);
}
}
}
return UPDATE_SUCCESS;
}

12
util/messages.po
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2015-10-30.1201\n" "Project-Id-Version: 2015-11-06.1208\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-10-30 00:04-0700\n" "POT-Creation-Date: 2015-11-06 00:04-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -22,7 +22,7 @@ msgstr ""
msgid "Cannot locate DNS info for database server '%s'" msgid "Cannot locate DNS info for database server '%s'"
msgstr "" msgstr ""
#: ../../include/photo/photo_driver.php:694 ../../mod/profile_photo.php:143 #: ../../include/photo/photo_driver.php:703 ../../mod/profile_photo.php:143
#: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424 #: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424
#: ../../mod/photos.php:92 ../../mod/photos.php:637 #: ../../mod/photos.php:92 ../../mod/photos.php:637
msgid "Profile Photos" msgid "Profile Photos"
@ -2798,15 +2798,15 @@ msgstr ""
msgid "Connection not found." msgid "Connection not found."
msgstr "" msgstr ""
#: ../../include/zot.php:684 #: ../../include/zot.php:685
msgid "Invalid data packet" msgid "Invalid data packet"
msgstr "" msgstr ""
#: ../../include/zot.php:700 #: ../../include/zot.php:701
msgid "Unable to verify channel signature" msgid "Unable to verify channel signature"
msgstr "" msgstr ""
#: ../../include/zot.php:2208 #: ../../include/zot.php:2209
#, php-format #, php-format
msgid "Unable to verify site signature for %s" msgid "Unable to verify site signature for %s"
msgstr "" msgstr ""