aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-04-26 19:47:05 -0700
committerzotlabs <mike@macgirvin.com>2017-04-26 19:47:05 -0700
commit6fcfab34883e5e93e9438ed4872de304e22b0f00 (patch)
tree6ad985a45df16bd173e7062e32d5f90aad2574e2
parentb88be137ca68c6b52e13ce1738fbc55651f37138 (diff)
downloadvolse-hubzilla-6fcfab34883e5e93e9438ed4872de304e22b0f00.tar.gz
volse-hubzilla-6fcfab34883e5e93e9438ed4872de304e22b0f00.tar.bz2
volse-hubzilla-6fcfab34883e5e93e9438ed4872de304e22b0f00.zip
issues from hubzilla:#737
-rw-r--r--Zotlabs/Lib/DB_Upgrade.php2
-rw-r--r--Zotlabs/Lib/NativeWiki.php4
-rw-r--r--Zotlabs/Lib/NativeWikiPage.php15
-rw-r--r--install/update.php4
4 files changed, 18 insertions, 7 deletions
diff --git a/Zotlabs/Lib/DB_Upgrade.php b/Zotlabs/Lib/DB_Upgrade.php
index 55c69bcca..bb72e7a05 100644
--- a/Zotlabs/Lib/DB_Upgrade.php
+++ b/Zotlabs/Lib/DB_Upgrade.php
@@ -83,7 +83,7 @@ class DB_Upgrade {
file_put_contents($lockfile, $x);
$r = q("select account_language from account where account_email = '%s' limit 1",
- dbesc(App::$config['system']['admin_email'])
+ dbesc(\App::$config['system']['admin_email'])
);
push_lang(($r) ? $r[0]['account_language'] : 'en');
diff --git a/Zotlabs/Lib/NativeWiki.php b/Zotlabs/Lib/NativeWiki.php
index 7786ec25a..4301feaa0 100644
--- a/Zotlabs/Lib/NativeWiki.php
+++ b/Zotlabs/Lib/NativeWiki.php
@@ -101,11 +101,11 @@ class NativeWiki {
static public function sync_a_wiki_item($uid,$id,$resource_id) {
- $r = q("SELECT * from item WHERE uid = %d AND ( id = %d OR ( resource_type = '%s' and resource_id = %d )) ",
+ $r = q("SELECT * from item WHERE uid = %d AND ( id = %d OR ( resource_type = '%s' and resource_id = '%s' )) ",
intval($uid),
intval($id),
dbesc(NWIKI_ITEM_RESOURCE_TYPE),
- intval($resource_id)
+ dbesc($resource_id)
);
if($r) {
xchan_query($r);
diff --git a/Zotlabs/Lib/NativeWikiPage.php b/Zotlabs/Lib/NativeWikiPage.php
index bd40367c9..ed3df436c 100644
--- a/Zotlabs/Lib/NativeWikiPage.php
+++ b/Zotlabs/Lib/NativeWikiPage.php
@@ -21,12 +21,23 @@ class NativeWikiPage {
$sql_extra = item_permissions_sql($channel_id,$observer_hash);
$r = q("select * from item where resource_type = 'nwikipage' and resource_id = '%s' and uid = %d and item_deleted = 0
- $sql_extra group by mid order by created asc",
+ $sql_extra order by created asc",
dbesc($resource_id),
intval($channel_id)
);
if($r) {
- $items = fetch_post_tags($r,true);
+ $x = [];
+ $y = [];
+
+ foreach($r as $rv) {
+ if(! in_array($rv['mid'],$x)) {
+ $y[] = $rv;
+ $x[] = $rv['mid'];
+ }
+ }
+
+ $items = fetch_post_tags($y,true);
+
foreach($items as $page_item) {
$title = get_iconfig($page_item['id'],'nwikipage','pagetitle',t('(No Title)'));
if(urldecode($title) !== 'Home') {
diff --git a/install/update.php b/install/update.php
index b37af9cef..75f9158c9 100644
--- a/install/update.php
+++ b/install/update.php
@@ -2512,8 +2512,8 @@ function update_r1187() {
function update_r1188() {
- $r1 = q("alter table channel add channel_password varchar(255) not null ");
- $r2 = q("alter table channel add channel_salt varchar(255) not null ");
+ $r1 = q("alter table channel add channel_password varchar(255) not null default '' ");
+ $r2 = q("alter table channel add channel_salt varchar(255) not null default '' ");
if($r1 && $r2)
return UPDATE_SUCCESS;