plugin: orphaned hooks weren't deleted.

update: fixing update job for tags.

diff --git a/boot.php b/boot.php
index d77e653f14fe3a8acb28ebba14be37c89c360d8e..0467524f689a43d70e48df0f5454a849c86c0301 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -14,7 +14,7 @@ require_once('include/features.php');
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_VERSION',      '3.1.1612' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1161      );
+define ( 'DB_UPDATE_VERSION',      1162      );
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 

diff --git a/include/plugin.php b/include/plugin.php
index 9795cacf92019116a439edee50ef28faca5713c3..b89cb2c53dc4cb0ef6089fc16972b4b0db5d587b 100644 (file)
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -175,7 +175,7 @@ function call_hooks($name, &$data = null) {
                        }
                        else {
                                // remove orphan hooks
-                               q("delete from hook where hook = '%s' and file = '$s' and function = '%s' limit 1",
+                               q("delete from hook where hook = '%s' and file = '%s' and function = '%s' limit 1",
                                        dbesc($name),
                                        dbesc($hook[0]),
                                        dbesc($hook[1])

diff --git a/update.php b/update.php
index 89b55cdb9c0770adeb33ff341f8959a7351ec25e..6dd58757b9fd6830c3f843e4108ac7bbe0a60155 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1159 );
+define( 'UPDATE_VERSION' , 1162 );
 
 /**
  *
@@ -1430,3 +1430,12 @@ function update_1160() {
 
        return UPDATE_SUCCESS;
 }
+
+function update_1161() {
+       $r = q("ALTER TABLE `pconfig` ADD INDEX (`cat`)");
+
+       if(!$r)
+               return UPDATE_FAILED;
+
+       return UPDATE_SUCCESS;
+}