aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-08-10 08:09:02 +0200
committerMario Vavti <mario@mariovavti.com>2017-08-10 08:09:02 +0200
commit0a96cdd950f30974fe0fecf60b214701673dad86 (patch)
treee7ee642601cd4fd980ca6bd2a038d742c77b4369 /include
parent8ab3a4ebd7fd25fe4b01e92c8d2f4507b0c6ff3d (diff)
downloadvolse-hubzilla-0a96cdd950f30974fe0fecf60b214701673dad86.tar.gz
volse-hubzilla-0a96cdd950f30974fe0fecf60b214701673dad86.tar.bz2
volse-hubzilla-0a96cdd950f30974fe0fecf60b214701673dad86.zip
merge red/master into dev
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php2
-rw-r--r--include/network.php9
-rw-r--r--include/photo/photo_driver.php4
3 files changed, 8 insertions, 7 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 13ae571d6..f15077e76 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -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)
diff --git a/include/network.php b/include/network.php
index fa49e5765..cd6e980ff 100644
--- a/include/network.php
+++ b/include/network.php
@@ -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();
}
diff --git a/include/photo/photo_driver.php b/include/photo/photo_driver.php
index f47a9c878..94d0faa94 100644
--- a/include/photo/photo_driver.php
+++ b/include/photo/photo_driver.php
@@ -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;
}