aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-05-05 17:53:23 -0700
committerfriendica <info@friendica.com>2012-05-05 17:53:23 -0700
commit49ccefd6c7add622ba84c72769a68d08ef043ef5 (patch)
tree6fa993f409b6ac1a49e730b13a859b089fd2570b
parent8ae83201cf8f3c943972a8f246b7972aa640afb4 (diff)
downloadvolse-hubzilla-49ccefd6c7add622ba84c72769a68d08ef043ef5.tar.gz
volse-hubzilla-49ccefd6c7add622ba84c72769a68d08ef043ef5.tar.bz2
volse-hubzilla-49ccefd6c7add622ba84c72769a68d08ef043ef5.zip
bad sql left after the mailbox in/out merge
-rw-r--r--boot.php2
-rw-r--r--mod/message.php2
-rw-r--r--util/messages.po50
3 files changed, 29 insertions, 25 deletions
diff --git a/boot.php b/boot.php
index 5fb309820..4583c7fb0 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '2.3.1332' );
+define ( 'FRIENDICA_VERSION', '2.3.1333' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1143 );
diff --git a/mod/message.php b/mod/message.php
index dbca45930..aa8851e46 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -198,7 +198,7 @@ function message_content(&$a) {
$o .= $header;
$r = q("SELECT count(*) AS `total` FROM `mail`
- WHERE `mail`.`uid` = %d AND `from-url` $eq '%s' GROUP BY `parent-uri` ORDER BY `created` DESC",
+ WHERE `mail`.`uid` = %d GROUP BY `parent-uri` ORDER BY `created` DESC",
intval(local_user()),
dbesc($myprofile)
);
diff --git a/util/messages.po b/util/messages.po
index 09fe69d3f..36e937807 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2.3.1332\n"
+"Project-Id-Version: 2.3.1333\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-04 10:00-0700\n"
+"POT-Creation-Date: 2012-05-05 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
#: ../../mod/profiles.php:365 ../../mod/delegate.php:6
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:485
-#: ../../include/items.php:3187 ../../index.php:306
+#: ../../include/items.php:3192 ../../index.php:306
msgid "Permission denied."
msgstr ""
@@ -157,7 +157,7 @@ msgstr ""
#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
#: ../../addon/posterous/posterous.php:90
-#: ../../view/theme/cleanzero/config.php:71
+#: ../../view/theme/cleanzero/config.php:80
#: ../../view/theme/diabook/config.php:91
#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
#: ../../include/conversation.php:555
@@ -214,7 +214,7 @@ msgstr ""
msgid "Edit event"
msgstr ""
-#: ../../mod/events.php:300 ../../include/text.php:1053
+#: ../../mod/events.php:300 ../../include/text.php:1054
msgid "link to source"
msgstr ""
@@ -396,7 +396,7 @@ msgstr ""
#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:408 ../../include/text.php:1304
+#: ../../view/theme/diabook/theme.php:408 ../../include/text.php:1305
#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
#: ../../include/conversation.php:126
msgid "photo"
@@ -2807,7 +2807,7 @@ msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156
#: ../../mod/admin.php:681 ../../mod/admin.php:880 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3099
+#: ../../mod/display.php:142 ../../include/items.php:3074
msgid "Item not found."
msgstr ""
@@ -4639,7 +4639,7 @@ msgid "Latest likes"
msgstr ""
#: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:400 ../../include/text.php:1302
+#: ../../view/theme/diabook/theme.php:400 ../../include/text.php:1303
#: ../../include/conversation.php:45 ../../include/conversation.php:118
msgid "event"
msgstr ""
@@ -5534,22 +5534,26 @@ msgstr ""
msgid "Post to Posterous by default"
msgstr ""
-#: ../../view/theme/cleanzero/config.php:73
+#: ../../view/theme/cleanzero/config.php:82
#: ../../view/theme/diabook/config.php:93
#: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72
msgid "Theme settings"
msgstr ""
-#: ../../view/theme/cleanzero/config.php:74
+#: ../../view/theme/cleanzero/config.php:83
msgid "Set resize level for images in posts and comments (width and height)"
msgstr ""
-#: ../../view/theme/cleanzero/config.php:75
+#: ../../view/theme/cleanzero/config.php:84
#: ../../view/theme/diabook/config.php:94 ../../view/theme/dispy/config.php:73
msgid "Set font-size for posts and comments"
msgstr ""
-#: ../../view/theme/cleanzero/config.php:76
+#: ../../view/theme/cleanzero/config.php:85
+msgid "Set theme width"
+msgstr ""
+
+#: ../../view/theme/cleanzero/config.php:86
#: ../../view/theme/quattro/config.php:56
msgid "Color scheme"
msgstr ""
@@ -6165,47 +6169,47 @@ msgstr ""
msgid "bytes"
msgstr ""
-#: ../../include/text.php:933 ../../include/text.php:948
+#: ../../include/text.php:934 ../../include/text.php:949
msgid "remove"
msgstr ""
-#: ../../include/text.php:933 ../../include/text.php:948
+#: ../../include/text.php:934 ../../include/text.php:949
msgid "[remove]"
msgstr ""
-#: ../../include/text.php:936
+#: ../../include/text.php:937
msgid "Categories:"
msgstr ""
-#: ../../include/text.php:951
+#: ../../include/text.php:952
msgid "Filed under:"
msgstr ""
-#: ../../include/text.php:967 ../../include/text.php:979
+#: ../../include/text.php:968 ../../include/text.php:980
msgid "Click to open/close"
msgstr ""
-#: ../../include/text.php:1084
+#: ../../include/text.php:1085
msgid "default"
msgstr ""
-#: ../../include/text.php:1096
+#: ../../include/text.php:1097
msgid "Select an alternate language"
msgstr ""
-#: ../../include/text.php:1306
+#: ../../include/text.php:1307
msgid "activity"
msgstr ""
-#: ../../include/text.php:1308
+#: ../../include/text.php:1309
msgid "comment"
msgstr ""
-#: ../../include/text.php:1309
+#: ../../include/text.php:1310
msgid "post"
msgstr ""
-#: ../../include/text.php:1464
+#: ../../include/text.php:1465
msgid "Item filed"
msgstr ""