arno/lychee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'mattsches-hotfix/undefined_vars' into develop

Browse Source
This commit is contained in:
Tobias Reich 2015-12-08 09:45:40 +01:00
commit 5b97a295d5
6 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
php/access/Guest.php
View File

@ -33,7 +33,7 @@ class Guest extends Access {
# Error # Error
default: exit('Error: Function not found! Please check the spelling of the called function.'); default: exit('Error: Function not found! Please check the spelling of the called function.');
return false; break; break;
} }
@ -177,4 +177,4 @@ class Guest extends Access {
} }
?> ?>

2
php/modules/Album.php
View File

@ -195,7 +195,7 @@ class Album extends Module {
# Execute query # Execute query
$albums = $this->database->query($query); $albums = $this->database->query($query);
if (!$albums) { if (!$albums) {
Log::error($database, __METHOD__, __LINE__, 'Could not get all albums (' . $database->error . ')'); Log::error($this->database, __METHOD__, __LINE__, 'Could not get all albums (' . $this->database->error . ')');
exit('Error: ' . $this->database->error); exit('Error: ' . $this->database->error);
} }

1
php/modules/Database.php
View File

@ -277,6 +277,7 @@ if(!defined('LYCHEE')) exit('Error: Direct access is not allowed!');
# This avoids problems with placeholders in user-input # This avoids problems with placeholders in user-input
# $skip = Number of placeholders which need to be skipped # $skip = Number of placeholders which need to be skipped
$skip = 0; $skip = 0;
$temp = '';
$num = array( $num = array(
'placeholder' => substr_count($query, '?'), 'placeholder' => substr_count($query, '?'),
'data' => count($data) 'data' => count($data)

1
php/modules/Import.php
View File

@ -11,7 +11,6 @@ class Import extends Module {
private $database = null; private $database = null;
private $settings = null; private $settings = null;
private $albumIDs = null;
public function __construct($database, $plugins, $settings) { public function __construct($database, $plugins, $settings) {

7
php/modules/Photo.php
View File

@ -486,8 +486,6 @@ class Photo extends Module {
if (extension_loaded('imagick')&&$this->settings['imagick']==='1') { if (extension_loaded('imagick')&&$this->settings['imagick']==='1') {
$rotateImage = 0;
switch ($info['orientation']) { switch ($info['orientation']) {
case 3: case 3:
@ -535,7 +533,6 @@ class Photo extends Module {
break; break;
case 3: case 3:
$process = true;
$sourceImg = imagerotate($sourceImg, -180, 0); $sourceImg = imagerotate($sourceImg, -180, 0);
break; break;
@ -552,7 +549,6 @@ class Photo extends Module {
break; break;
case 6: case 6:
$process = true;
$sourceImg = imagerotate($sourceImg, -90, 0); $sourceImg = imagerotate($sourceImg, -90, 0);
$newWidth = $info['height']; $newWidth = $info['height'];
$newHeight = $info['width']; $newHeight = $info['width'];
@ -566,7 +562,6 @@ class Photo extends Module {
break; break;
case 8: case 8:
$process = true;
$sourceImg = imagerotate($sourceImg, 90, 0); $sourceImg = imagerotate($sourceImg, 90, 0);
$newWidth = $info['height']; $newWidth = $info['height'];
$newHeight = $info['width']; $newHeight = $info['width'];
@ -1251,4 +1246,4 @@ class Photo extends Module {
} }
?> ?>

3
php/modules/Plugins.php
View File

@ -20,7 +20,6 @@ class Plugins implements \SplSubject {
if (!isset($files)) return false; if (!isset($files)) return false;
# Init vars # Init vars
$plugins = $this;
$this->files = $files; $this->files = $files;
# Load plugins # Load plugins
@ -92,4 +91,4 @@ class Plugins implements \SplSubject {
} }
?> ?>