diff --git a/include/nav.php b/include/nav.php
index 3f65fe919..a52e4afa3 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -156,7 +156,7 @@ function nav(&$a) {
$banner = get_config('system','banner');
if($banner === false)
- $banner .= 'red';
+ $banner .= '
red';
$tpl = get_markup_template('nav.tpl');
diff --git a/mod/filerm.php b/mod/filerm.php
index f70816266..a37e80b31 100644
--- a/mod/filerm.php
+++ b/mod/filerm.php
@@ -18,9 +18,9 @@ function filerm_content(&$a) {
logger('filerm: tag ' . $term . ' item ' . $item_id);
if($item_id && strlen($term)) {
- $r = q("delete from term where uid = %d and type = %d and oid = %d and $term = '%s' limit 1",
+ $r = q("delete from term where uid = %d and type = %d and oid = %d and term = '%s' limit 1",
intval(local_user()),
- intval(($category) ? FILE_CATEGORY : FILE_HASHTAG),
+ intval(($category) ? TERM_CATEGORY : TERM_FILE),
intval($item_id),
dbesc($term)
);
diff --git a/view/theme/darkbubble/dbicons.png b/view/theme/darkbubble/dbicons.png
deleted file mode 100644
index 696ef779c..000000000
Binary files a/view/theme/darkbubble/dbicons.png and /dev/null differ
diff --git a/view/theme/darkbubble/screenshot.jpg b/view/theme/darkbubble/screenshot.jpg
deleted file mode 100644
index 0d9af2c04..000000000
Binary files a/view/theme/darkbubble/screenshot.jpg and /dev/null differ
diff --git a/view/theme/darkbubble/style.css b/view/theme/darkbubble/style.css
deleted file mode 100644
index 9336dc01b..000000000
--- a/view/theme/darkbubble/style.css
+++ /dev/null
@@ -1,33 +0,0 @@
-@import url('../testbubble/style.css');
-
-.icon {
- background-image: url('dbicons.png');
-}
-
-body {
- background: #000000;
- color: #dddddd;
-}
-
-.info-message {
- color: #444444;
-}
-
-#id_openid_url {
- background: url(../testbubble/login-bg.gif) no-repeat #ffffff;
- background-position: 0 50%;
- padding-left: 18px;
- width: 385px;
- color: #000000;
-}
-
-.vevent, .eventcal {
- color: #000000;
-}
-.event-list-date {
- color: #DDDDDD;
-}
-
-.fortunate {
- color: #8888FF !important;
-}
\ No newline at end of file
diff --git a/view/theme/darkbubble/theme.php b/view/theme/darkbubble/theme.php
deleted file mode 100644
index 053730c21..000000000
--- a/view/theme/darkbubble/theme.php
+++ /dev/null
@@ -1,22 +0,0 @@
-
- */
-
-
-$a->theme_info = array(
- 'extends' => 'testbubble',
-);
-
-
-$a->page['htmlhead'] .= <<< EOT
-
-EOT;
diff --git a/view/theme/facepark/border.jpg b/view/theme/facepark/border.jpg
deleted file mode 100644
index 034a1cb63..000000000
Binary files a/view/theme/facepark/border.jpg and /dev/null differ
diff --git a/view/theme/facepark/comment_item.tpl b/view/theme/facepark/comment_item.tpl
deleted file mode 100644
index 3503c3843..000000000
--- a/view/theme/facepark/comment_item.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-
$desc
- - - diff --git a/view/theme/testbubble/photo_top.tpl b/view/theme/testbubble/photo_top.tpl deleted file mode 100644 index 48a546a16..000000000 --- a/view/theme/testbubble/photo_top.tpl +++ /dev/null @@ -1,8 +0,0 @@ - -