Merge branch 'master' into tres

Conflicts: include/notifier.php
2015-04-29 21:49:43 -07:00
parent 6679734135 2376d2140a
commit c4221f3273
26 changed files with 1229 additions and 1141 deletions
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -188,7 +188,7 @@ function editwebpage_content(&$a) {
 		'$video' => t('Insert Vorbis [.ogg] video'),
 		'$audio' => t('Insert Vorbis [.ogg] audio'),
 		'$setloc' => t('Set your location'),
-		'$noloc' => t('Clear browser location'),
+		'$noloc' => ((get_pconfig($uid, 'system', 'use_browser_location')) ? t('Clear browser location') : ''),
 		'$wait' => t('Please wait'),
 		'$permset' => t('Permission settings'),
 		'$ptyp' => $itm[0]['type'],