Merge pull request #19 from plaidfluff/7e454e815dd67f0ac3804e213599be9bbbc2755e

Change update.php shebang to support any in-path installation locatio…
Fix category count query for mysql

diff --git a/classes/feeds.php b/classes/feeds.php
index aacad55084c71cd9a52b6f697be5b0c354629062..e37401b8e7867294bccce298bb6ad4fd69b2c764 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -545,6 +545,9 @@ class Feeds extends Protected_Handler {
 \r
                                        $reply['content'] .= "</div>";\r
 \r
+                                       $reply['content'] .= "<div id=\"PTITLE-FULL-$id\" style=\"display : none\">" .\r
+                                               strip_tags($line['title']) . "</div>";\r
+\r
                                        $reply['content'] .= "<span id=\"RTITLE-$id\"\r
                                                onclick=\"return cdmClicked(event, $id);\"\r
                                                class=\"titleWrap$hlc_suffix\">\r

diff --git a/classes/pref_filters.php b/classes/pref_filters.php
index 9b8c295ff640931dd60d85eed73a6b813ee5cf2f..dc1f424102e7cf113f112728bc0d186ba1137409 100644 (file)
--- a/classes/pref_filters.php
+++ b/classes/pref_filters.php
@@ -38,7 +38,7 @@ class Pref_Filters extends Protected_Handler {
 
                print __("Articles matching this filter:");
 
-               print "<div class=\"inactiveFeedHolder\">";
+               print "<div class=\"filterTestHolder\">";
                print "<table width=\"100%\" cellspacing=\"0\" id=\"prefErrorFeedList\">";
 
                if ($regexp_valid) {

diff --git a/include/functions.php b/include/functions.php
index e914ac365f444ae61cc109b365f63339ac156641..96b502d58554076c8043d98cc2a0e31e59eb0725 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -3350,6 +3350,9 @@
                        $rv['content'] .= "<div id=\"PTITLE-$id\" style=\"display : none\">" .
                                truncate_string(strip_tags($line['title']), 15) . "</div>";
 
+                       $rv['content'] .= "<div id=\"PTITLE-FULL-$id\" style=\"display : none\">" .
+                               strip_tags($line['title']) . "</div>";
+
                        $rv['content'] .= "<div class=\"postReply\" id=\"POST-$id\">";
 
                        $rv['content'] .= "<div onclick=\"return postClicked(event, $id)\"

diff --git a/js/functions.js b/js/functions.js
index 0b0b475c6710bb4d8d4ae16f5f0343e92cf5404f..b2d79dc567a012eed2a01a4a6006936ab90d0f7e 100644 (file)
--- a/js/functions.js
+++ b/js/functions.js
@@ -1058,6 +1058,17 @@ function quickAddFilter() {
                        href: query});
 
                dialog.show();
+
+               var lh = dojo.connect(dialog, "onLoad",
+                               function() {
+                                       dojo.disconnect(lh);
+                                       var title = $("PTITLE-FULL-" + active_post_id);
+
+                                       if (title) {
+                                               $("filterDlg_regExp").value = title.innerHTML;
+                                       }
+                       });
+
        } catch (e) {
                exception_error("quickAddFilter", e);
        }

diff --git a/tt-rss.css b/tt-rss.css
index ff48914c04483e04370b2b5a8e25087ae7a215da..30f94d28834a0d526abe7ff508c3f2999743071a 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -367,7 +367,7 @@ table.prefFeedList td.feedSelect {
        text-align : center;
 }
 
-div.prefFeedCatHolder, div.prefFeedOPMLHolder, div.inactiveFeedHolder {
+div.prefFeedCatHolder, div.prefFeedOPMLHolder, div.inactiveFeedHolder, div.filterTestHolder {
        height : 300px;
        overflow : auto;
        border-width : 0px 1px 1px 1px;
@@ -377,7 +377,7 @@ div.prefFeedCatHolder, div.prefFeedOPMLHolder, div.inactiveFeedHolder {
        background-color : #ecf4ff;
 }
 
-div.prefFeedOPMLHolder {
+div.prefFeedOPMLHolder, div.filterTestHolder {
        border-width : 1px 1px 1px 1px;
 }