vitalif
/
FeedOnFeeds
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Return fof_db_get_subscribed_users, fix one more static in simplepie

master
vitalif 2014-11-23 23:40:04 +00:00
parent 3402418fc3
commit 43bb484987
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fof-db.php
View File

@ -197,6 +197,13 @@ function fof_db_get_tagged_item_count($user_id, $tag_id)
);
}
function fof_db_get_subscribed_users($feed_id)
{
global $FOF_SUBSCRIPTION_TABLE;
return fof_safe_query("select user_id from $FOF_SUBSCRIPTION_TABLE where $FOF_SUBSCRIPTION_TABLE.feed_id = %d", $feed_id);
}
function fof_db_is_subscribed($user_id, $feed_url)
{
global $FOF_FEED_TABLE, $FOF_SUBSCRIPTION_TABLE;

9
fof-main.php
View File

@ -503,7 +503,7 @@ function fof_delete_subscription($user_id, $feed_id)
{
fof_db_delete_subscription($user_id, $feed_id);
if(mysql_num_rows(fof_get_subscribed_users($feed_id)) == 0)
if(mysql_num_rows(fof_db_get_subscribed_users($feed_id)) == 0)
{
fof_db_delete_feed($feed_id);
}
@ -657,11 +657,6 @@ function fof_feed_exists($url)
return $feed;
}
function fof_get_subscribed_users($feed_id)
{
return fof_db_get_subscribed_users($feed_id);
}
function fof_generate_sudo_id()
{
global $fof_sudo_id_user;
@ -907,7 +902,7 @@ function fof_apply_plugin_tags($feed_id, $item_id = NULL, $user_id = NULL)
$users[] = $user_id;
else
{
$result = fof_get_subscribed_users($feed_id);
$result = fof_db_get_subscribed_users($feed_id);
while($row = fof_db_get_row($result))
$users[] = $row['user_id'];

2
simplepie/simplepie.php
View File

@ -13080,7 +13080,7 @@ class SimplePie_Parse_Date
*
* @access public
*/
function get()
static function get()
{
static $object;
if (!$object)

12
simplepie/simplepie.php.diff
View File

@ -1,5 +1,5 @@
--- simplepie.php.orig 2014-11-01 16:24:27.412577890 +0300
+++ simplepie.php 2014-11-01 16:29:06.248585480 +0300
--- simplepie.php.orig 2014-11-24 02:39:30.050372020 +0300
+++ simplepie.php 2014-11-24 02:38:16.290370007 +0300
@@ -43,6 +43,10 @@
* @todo phpDoc comments
*/
@ -1350,7 +1350,13 @@
{
$ipPart = SimplePie_Net_IPv6::SplitV64($ip);
$count = 0;
@@ -13059,7 +13085,7 @@ class SimplePie_Parse_Date
@@ -13054,12 +13080,12 @@ class SimplePie_Parse_Date
*
* @access public
*/
- function get()
+ static function get()
{
static $object;
if (!$object)
{