diff options
| author | friendica <info@friendica.com> | 2014-01-06 02:37:06 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-01-06 02:37:06 -0800 |
| commit | 196b3022bd8759428d04d8d3bcf10c27d7c3b329 (patch) | |
| tree | ba785f204e8616af5751d7303d3357c75b9d30bc /mod/editblock.php | |
| parent | 0c85c9748096d625ae9baa29fb9aad48bab3a208 (diff) | |
| parent | ae8a30273a6b787985d06fa776d1726d4427f9be (diff) | |
| download | volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.tar.gz volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.tar.bz2 volse-hubzilla-196b3022bd8759428d04d8d3bcf10c27d7c3b329.zip | |
Merge branch 'master' into movejs
Conflicts:
version.inc
Diffstat (limited to 'mod/editblock.php')
| -rw-r--r-- | mod/editblock.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mod/editblock.php b/mod/editblock.php index 8b5b2d16c..e8f3e90f8 100644 --- a/mod/editblock.php +++ b/mod/editblock.php @@ -111,6 +111,7 @@ function editblock_content(&$a) { $o .= replace_macros($tpl,array( '$return_path' => $rp, '$action' => 'item', + '$webpage' => ITEM_BUILDBLOCK, '$share' => t('Edit'), '$upload' => t('Upload photo'), '$attach' => t('Attach file'), |