Fixing SQL problem and speeding up search.

diff --git a/include/security.php b/include/security.php
index 078f47d70479ed1836664698d95960f2e6184bc3..6e722d673bb7b664b9eddb4bbafd1a8c99af0bc2 100644 (file)
--- a/include/security.php
+++ b/include/security.php
@@ -310,9 +310,9 @@ function item_permissions_sql($owner_id,$remote_verified = false,$groups = null)
                                dbesc($gs),
                                dbesc($gs)
 */
-                               " AND ( `item`.private = 0 OR ( `item`.private in (1,2) AND wall = 1
+                               " AND ( `item`.private = 0 OR ( `item`.private in (1,2) AND `item`.`wall` = 1
                                  AND ( NOT (`item`.deny_cid REGEXP '<%d>' OR `item`.deny_gid REGEXP '%s')
-                                 AND ( `item`.allow_cid REGEXP '<%d>' OR `item`.allow_gid REGEXP '%s' OR ( allow_cid = '' AND allow_gid = '')))))
+                                 AND ( `item`.allow_cid REGEXP '<%d>' OR `item`.allow_gid REGEXP '%s' OR ( `item`.allow_cid = '' AND `item`.allow_gid = '')))))
                                ",
                                intval($remote_user),
                                dbesc($gs),

diff --git a/mod/profile.php b/mod/profile.php
index 263d7f80b2126bf8d77989a77f0f27a0be590067..f442c73f5a6acace0d789d2f51563c60e315d2f8 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -263,16 +263,16 @@ function profile_content(&$a, $update = 0) {
                        }
                }
 
-               //  check if we serve a mobile device and get the user settings 
+               //  check if we serve a mobile device and get the user settings
                //  accordingly
-               if ($a->is_mobile) { 
+               if ($a->is_mobile) {
                    $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network');
                    $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
-               } else { 
+               } else {
                    $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
                    $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 40);
                }
-               //  now that we have the user settings, see if the theme forces 
+               //  now that we have the user settings, see if the theme forces
                //  a maximum item number which is lower then the user choice
                if(($a->force_max_items > 0) && ($a->force_max_items < $itemspage_network))
                        $itemspage_network = $a->force_max_items;
@@ -294,7 +294,6 @@ function profile_content(&$a, $update = 0) {
                        intval($a->profile['profile_uid'])
 
                );
-
        }
 
        $parents_arr = array();

diff --git a/mod/search.php b/mod/search.php
index 032dc17e1005ad4baf6ad406e75be37646115ea0..c7387c5165e768fdc548d4d9c2215d002456f3e1 100644 (file)
--- a/mod/search.php
+++ b/mod/search.php
@@ -133,7 +133,7 @@ function search_content(&$a) {
                $sql_table = sprintf("`item` INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
                                        dbesc(protect_sprintf($search)), intval(TERM_OBJ_POST), intval(TERM_HASHTAG), intval(local_user()));
 
-               $sql_order = "`item`.`received`";
+               $sql_order = "`item`.`id`";
        } else {
                if (get_config('system','use_fulltext_engine')) {
                        $sql_extra = sprintf(" AND MATCH (`item`.`body`, `item`.`title`) AGAINST ('%s' in boolean mode) ", dbesc(protect_sprintf($search)));