Merge branch 'pull'

diff --git a/mod/network.php b/mod/network.php
index 4f58fc4fbc8fb487f3d652e3d1c381e229cb741c..e9f3913ff43a7ef3f8267bfb946566fe17d5dbcd 100755 (executable)
--- a/mod/network.php
+++ b/mod/network.php
@@ -192,7 +192,7 @@ function network_content(&$a, $update = 0) {
                        'sel'=>$starred_active,
                ),
                array(
-                       'label' => t('Bookmarks'),
+                       'label' => t('Shared Links'),
                        'url'=>$a->get_baseurl() . '/' . str_replace('/new', '', $a->cmd) . ((x($_GET,'cid')) ? '/?f=&cid=' . $_GET['cid'] : '') . '&bmark=1',
                        'sel'=>$bookmarked_active,
                ),      

diff --git a/mod/settings.php b/mod/settings.php
index f42fdb3973178d30a1f5740b546bff79cadc1647..15fd0c352ef897bd8fedd971770131f046ced63f 100755 (executable)
--- a/mod/settings.php
+++ b/mod/settings.php
@@ -559,7 +559,7 @@ function settings_content(&$a) {
                
                $tpl = get_markup_template("settings_addons.tpl");
                $o .= replace_macros($tpl, array(
-                       '$form_security_token' => get_form_security_token("settings_addons"),
+                       '$form_security_token' => get_form_security_token("settings_addon"),
                        '$title'        => t('Plugin Settings'),
                        '$tabs'         => $tabs,
                        '$settings_addons' => $settings_addons