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

merge red/master into dev

Browse Source
This commit is contained in:
Mario Vavti
2017-08-10 08:09:02 +02:00
parent 8ab3a4ebd7
commit 0a96cdd950
9 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/conversation.php
View File

@@ -538,7 +538,7 @@ function conversation($items, $mode, $update, $page_mode = 'traditional', $prepa
}
elseif ($mode === 'photos') {
$profile_onwer = App::$profile['profile_uid'];
$profile_owner = App::$profile['profile_uid'];
$page_writeable = ($profile_owner == local_channel());
$live_update_div = '<div id="live-photos"></div>' . "\r\n";
// for photos we've already formatted the top-level item (the photo)

9
include/network.php
View File

@@ -671,11 +671,12 @@ function parse_xml_string($s,$strict = true) {
libxml_use_internal_errors(true);
$x = @simplexml_load_string($s2);
if(! $x) {
if($x === false) {
logger('libxml: parse: error: ' . $s2, LOGGER_DATA);
foreach(libxml_get_errors() as $err)
logger('libxml: parse: ' . $err->code." at ".$err->line.":".$err->column." : ".$err->message, LOGGER_DATA);
foreach(libxml_get_errors() as $err) {
logger('libxml: parse: ' . $err->code . ' at ' . $err->line
. ':' . $err->column . ' : ' . $err->message, LOGGER_DATA);
}
libxml_clear_errors();
}

4
include/photo/photo_driver.php
View File

@@ -446,7 +446,7 @@ abstract class photo_driver {
*/
function guess_image_type($filename, $headers = '') {
logger('Photo: guess_image_type: '.$filename . ($headers?' from curl headers':''), LOGGER_DEBUG);
// logger('Photo: guess_image_type: '.$filename . ($headers?' from curl headers':''), LOGGER_DEBUG);
$type = null;
if ($headers) {
@@ -513,7 +513,7 @@ function guess_image_type($filename, $headers = '') {
}
}
logger('Photo: guess_image_type: type = ' . $type, LOGGER_DEBUG);
logger('Photo: guess_image_type: filename = ' . $filename . ' type = ' . $type, LOGGER_DEBUG);
return $type;
}