diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
index 45aeb0800..c79439549 100644
--- a/privacy_image_cache/privacy_image_cache.php
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -112,7 +112,7 @@ function privacy_image_cache_ping_xmlize_hook(&$a, &$o) {
* @param App $a
* @param null|object $b
*/
-function privacy_image_cache_cron(&$a, &$b) {
+function privacy_image_cache_cron(&$a = null, &$b = null) {
$cachetime = get_config('privacy_image_cache','cache_time');
if (!$cachetime) $cachetime = PRIVACY_IMAGE_CACHE_DEFAULT_TIME;
@@ -161,7 +161,7 @@ function privacy_image_cache_plugin_admin(&$a, &$o){
* @param App $a
* @param null|object $o
*/
-function privacy_image_cache_plugin_admin_post(&$a, &$o){
+function privacy_image_cache_plugin_admin_post(&$a = null, &$o = null){
check_form_security_token_redirectOnErr('/admin/plugins/privacy_image_cache', 'picsave');
if (isset($_REQUEST['save'])) {
diff --git a/public_server.tgz b/public_server.tgz
index c9a67fe35..d970d4861 100755
Binary files a/public_server.tgz and b/public_server.tgz differ
diff --git a/public_server/public_server.php b/public_server/public_server.php
index 9d4698291..3711854f8 100644
--- a/public_server/public_server.php
+++ b/public_server/public_server.php
@@ -106,7 +106,7 @@ function public_server_cron($a,$b) {
$flagposts = get_config('public_server','flagposts');
$flagpostsexpire = get_config('public_server','flagpostsexpire');
if ($flagposts && $flagpostsexpire) {
- $r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and expire = 0 and 'page-flags' = 0",intval(flagposts));
+ $r = q("select uid from user where account_expired = 0 and login_date < UTC_TIMESTAMP() - INTERVAL %d DAY and account_expires_on = '0000-00-00 00:00:00' and expire = 0 and `page-flags` = 0",intval($flagposts));
if(count($r)) {
foreach($r as $rr)
q("update user set expire = %d where uid = %d limit 1",
diff --git a/smiley_pack.tgz b/smiley_pack.tgz
index 790bc064f..59f0956d5 100644
Binary files a/smiley_pack.tgz and b/smiley_pack.tgz differ
diff --git a/smiley_pack/icons/fight/alpha.png b/smiley_pack/icons/fight/alpha.png
new file mode 100644
index 000000000..09e3f233c
Binary files /dev/null and b/smiley_pack/icons/fight/alpha.png differ
diff --git a/smiley_pack/icons/sad/sigh.gif b/smiley_pack/icons/sad/sigh.gif
new file mode 100644
index 000000000..686022664
Binary files /dev/null and b/smiley_pack/icons/sad/sigh.gif differ
diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index ed4d0e651..374273d45 100644
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -2,7 +2,7 @@
/*
* Name: Smiley Pack
* Description: Pack of smileys that make master too AOLish.
- * Version: 1.0
+ * Version: 1.01
* Author: Thomas Willingham (based on Mike Macgirvin's Adult Smile template)
* All smileys from sites offering them as Public Domain
*
@@ -204,6 +204,9 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':prisoner';
$b['icons'][] = '';
+ $b['texts'][] = ':sigh';
+ $b['icons'][] = '';
+
#Smoking - only one smiley in here, maybe it needs moving elsewhere?
$b['texts'][] = ':smoking';
@@ -295,6 +298,9 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':alienfight';
$b['icons'][] = '';
+ $b['texts'][] = ':alpha';
+ $b['icons'][] = '';
+
$b['texts'][] = ':army';
$b['icons'][] = '';