summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Arthur <paul.arthur@flowerysong.com>2013-01-25 20:30:23 -0500
committerPaul Arthur <paul.arthur@flowerysong.com>2013-01-25 20:30:36 -0500
commitd14b5215ebd23097f504607c1db3f653c58cf3e9 (patch)
treef25fc0fff0d69ffaac22226decef54db45781c2c
parentc864d180cb1d11bd40d237284e43badbb2429e89 (diff)
downloadampache-d14b5215ebd23097f504607c1db3f653c58cf3e9.tar.gz
ampache-d14b5215ebd23097f504607c1db3f653c58cf3e9.tar.bz2
ampache-d14b5215ebd23097f504607c1db3f653c58cf3e9.zip
Cosmetics: s/incase/in case/
-rw-r--r--bin/fix_filenames.inc2
-rwxr-xr-xdocs/CHANGELOG2
-rw-r--r--lib/class/art.class.php4
-rw-r--r--lib/class/catalog.class.php2
-rw-r--r--play/index.php2
-rw-r--r--server/localplay.ajax.php2
-rw-r--r--themes/classic/theme.cfg.php2
-rw-r--r--themes/fresh/theme.cfg.php2
-rw-r--r--themes/greysme/theme.cfg.php2
-rw-r--r--themes/penguin/theme.cfg.php2
10 files changed, 11 insertions, 11 deletions
diff --git a/bin/fix_filenames.inc b/bin/fix_filenames.inc
index 1518b1ec..94531b89 100644
--- a/bin/fix_filenames.inc
+++ b/bin/fix_filenames.inc
@@ -164,7 +164,7 @@ function charset_directory_correct($path) {
function charset_rename_file($full_file,$translated_filename) {
// First break out the base directory name and make sure it exists
- // incase our crap char is in the directory
+ // in case our crap char is in the directory
$directory = dirname($translated_filename);
$data = preg_split("/[\/\\\]/",$directory);
$path = '';
diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 39887712..684edf8d 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -247,7 +247,7 @@
- Fix incorrect debug_event() on login due to typo
- Remove manage democratic playlist as it has no meaning in the
current version
- - Run Dba::reset_db_charset() after upgrade incase people are playing
+ - Run Dba::reset_db_charset() after upgrade in case people are playing
hot potato with their charsets.
- Move Server Preferences to Admin menu (Thx geekdawg)
- Fixed missing web_path reference on radio creation link
diff --git a/lib/class/art.class.php b/lib/class/art.class.php
index af1c0bca..c18c9313 100644
--- a/lib/class/art.class.php
+++ b/lib/class/art.class.php
@@ -492,7 +492,7 @@ class Art extends database_object {
return $id3['asf']['extended_content_description_object']['content_descriptors']['13']['data'];
}
elseif (isset($id3['id3v2']['APIC'])) {
- // Foreach incase they have more then one
+ // Foreach in case they have more then one
foreach ($id3['id3v2']['APIC'] as $image) {
return $image['data'];
}
@@ -1093,7 +1093,7 @@ class Art extends database_object {
}
if (isset($id3['id3v2']['APIC'])) {
- // Foreach incase they have more then one
+ // Foreach in case they have more then one
foreach ($id3['id3v2']['APIC'] as $image) {
$data[] = array(
'song' => $song->file,
diff --git a/lib/class/catalog.class.php b/lib/class/catalog.class.php
index 18d459c1..fee53717 100644
--- a/lib/class/catalog.class.php
+++ b/lib/class/catalog.class.php
@@ -259,7 +259,7 @@ class Catalog extends database_object {
*/
public static function create($data) {
- // Clean up the path just incase
+ // Clean up the path just in case
$data['path'] = rtrim(rtrim(trim($data['path']),'/'),'\\');
$path = Dba::escape($data['path']);
diff --git a/play/index.php b/play/index.php
index c76bdc34..cc3f9437 100644
--- a/play/index.php
+++ b/play/index.php
@@ -165,7 +165,7 @@ if ($demo_id) {
if ($random) {
if ($start < 1) {
$oid = Random::get_single_song($_REQUEST['type']);
- // Save this one incase we do a seek
+ // Save this one in case we do a seek
$_SESSION['random']['last'] = $oid;
}
else {
diff --git a/server/localplay.ajax.php b/server/localplay.ajax.php
index da3b06c9..66368870 100644
--- a/server/localplay.ajax.php
+++ b/server/localplay.ajax.php
@@ -122,7 +122,7 @@ switch ($_REQUEST['action']) {
$localplay->delete_track($id);
- // Wait incase we just deleted what we were playing
+ // Wait in case we just deleted what we were playing
sleep(3);
$objects = $localplay->get();
$status = $localplay->status();
diff --git a/themes/classic/theme.cfg.php b/themes/classic/theme.cfg.php
index c89ff7f6..b90d1b9f 100644
--- a/themes/classic/theme.cfg.php
+++ b/themes/classic/theme.cfg.php
@@ -34,7 +34,7 @@ author = "Ros"
; Theme Maintainer
; This is just a way of listing who is responsible for
-; maintaining this theme incase it's not working right
+; maintaining this theme in case it's not working right
; please include an e-mail address so you can be contacted
; DEFAULT: N/A
maintainer = "Spocky"
diff --git a/themes/fresh/theme.cfg.php b/themes/fresh/theme.cfg.php
index ccaadc05..09769c8b 100644
--- a/themes/fresh/theme.cfg.php
+++ b/themes/fresh/theme.cfg.php
@@ -34,7 +34,7 @@ author = "eigan"
; Theme Maintainer
; This is just a way of listing who is responsible for
-; maintaining this theme incase it's not working right
+; maintaining this theme in case it's not working right
; please include an e-mail address so you can be contacted
; DEFAULT: N/A
maintainer = "eigan - einargangso@gmail.com"
diff --git a/themes/greysme/theme.cfg.php b/themes/greysme/theme.cfg.php
index f77a8e4b..7a15aba9 100644
--- a/themes/greysme/theme.cfg.php
+++ b/themes/greysme/theme.cfg.php
@@ -35,7 +35,7 @@ author = "Mickael Despesse (Spocky)"
; Theme Maintainer
; This is just a way of listing who is responsible for
-; maintaining this theme incase it's not working right
+; maintaining this theme in case it's not working right
; please include an e-mail address so you can be contacted
; DEFAULT: N/A
maintainer = "Spocky"
diff --git a/themes/penguin/theme.cfg.php b/themes/penguin/theme.cfg.php
index 6a9b5071..70e4e4a9 100644
--- a/themes/penguin/theme.cfg.php
+++ b/themes/penguin/theme.cfg.php
@@ -35,7 +35,7 @@ author = "Jeroen Doppenberg"
; Theme Maintainer
; This is just a way of listing who is responsible for
-; maintaining this theme incase it's not working right
+; maintaining this theme in case it's not working right
; please include an e-mail address so you can be contacted
; DEFAULT: N/A
maintainer = "info@dopdop.nl"