diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-12-18 10:13:54 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-12-18 10:13:54 +0000 |
| commit | e1f4caae38d0c26435655420ff18c48d88832b3e (patch) | |
| tree | 4c27d8dc2256993a7a6690b29ba3dd302219c9fb /lib | |
| parent | 2e4141d2f5cb1f3ccbb73bc5deec07601a85bcc5 (diff) | |
| download | ampache-e1f4caae38d0c26435655420ff18c48d88832b3e.tar.gz ampache-e1f4caae38d0c26435655420ff18c48d88832b3e.tar.bz2 ampache-e1f4caae38d0c26435655420ff18c48d88832b3e.zip | |
few more tweaks
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/class/catalog.class.php | 8 | ||||
| -rw-r--r-- | lib/class/song.class.php | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php index 75736af0..cd805546 100644 --- a/lib/class/catalog.class.php +++ b/lib/class/catalog.class.php @@ -305,6 +305,10 @@ class Catalog { $full_file = stripslashes($path."/".$file); $full_file = str_replace("//","/",$full_file); + // Incase this is the second time through clear this variable + // if it was set the day before + unset($failed_check); + if (conf('no_symlinks')) { if (is_link($full_file)) { $failed_check = 1; } } @@ -312,7 +316,6 @@ class Catalog { /* If it's a dir run this function again! */ if (is_dir($full_file) AND !$failed_check) { $this->add_files($full_file,$gather_type,$parse_m3u); - unset($failed_check); } //it's a directory /* If it's not a dir let's roll with it */ @@ -570,6 +573,9 @@ class Catalog { $full_file = stripslashes($path . "/" . $file); $full_file = str_replace("//","/",$full_file); + /* Incase this is the second time through, unset it before checking */ + unset($failed_check); + if (conf('no_symlinks')) { if (is_link($full_file)) { $failed_check = true; } } diff --git a/lib/class/song.class.php b/lib/class/song.class.php index 5363bc43..655c03be 100644 --- a/lib/class/song.class.php +++ b/lib/class/song.class.php @@ -312,7 +312,7 @@ class Song { $array['change'] = true; $array['text'] .= "<br />" . _("Year") . " [$song->year] " . _("updated to") . " [$new_song->year]\n"; } // if year - if (trim($song->comment) != trim($new_song->comment)) { + if (trim($song->comment) != trim(stripslashes($new_song->comment))) { $array['change'] = true; $array['text'] .= "<br />" . _("Comment") . " [$song->comment] " . _("updated to") . " [$new_song->comment]\n"; } // if comment |